From bc56c90539d79663dfee40d545a8625b3bbd7829 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 10 Jan 2026 13:56:45 -0800
Subject: [PATCH 01/33] chore(Admin > Edit Album): Select a thumbnail and
 generate XML

---
 src/components/AdminAlbum/Fields.tsx | 254 ++++++++++++++++++++++++++-
 src/components/AdminAlbum/Thumbs.tsx |   4 +-
 src/models/album.ts                  |  43 +++--
 3 files changed, 276 insertions(+), 25 deletions(-)

diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 374b0433..b5f0abf4 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -1,7 +1,14 @@
+import Button from '@mui/joy/Button'
 import Input from '@mui/joy/Input'
+import Option from '@mui/joy/Option'
+import Select from '@mui/joy/Select'
 import Stack from '@mui/joy/Stack'
+import Textarea from '@mui/joy/Textarea'
+import { useEffect, useState } from 'react'
+import xml2js from 'xml2js'
 
 import { type AlbumResponseBody } from '../../lib/album'
+import type { Item } from '../../types/common'
 import { type ItemState } from './AdminAlbumClient'
 import Xml from './Xml'
 
@@ -9,24 +16,253 @@ export default function Fields(
   { albumEntity, item, children }:
   { albumEntity: AlbumResponseBody['album'] | undefined, item: ItemState, children: React.ReactElement },
 ) {
+  const [editedItem, setEditedItem] = useState<Item | null>(item)
+  const [xmlOutput, setXmlOutput] = useState<string>('')
+
+  useEffect(() => {
+    setEditedItem(item)
+    setXmlOutput('')
+  }, [item])
+
+  const handleFieldChange = (field: keyof Item, value: string) => {
+    if (editedItem) {
+      setEditedItem({ ...editedItem, [field]: value })
+    }
+  }
+
+  const generateXml = () => {
+    if (!editedItem || !albumEntity) return
+
+    // Create a copy of the album with the updated item
+    const updatedAlbum = { ...albumEntity }
+    const items = [...updatedAlbum.items]
+    const itemIndex = items.findIndex(i => i?.filename === editedItem.filename)
+
+    if (itemIndex !== -1) {
+      items[itemIndex] = editedItem
+    }
+
+    // Convert to XML - need to transform back to XML format with snake_case fields
+    const xmlItems = items.map(item => {
+      const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+      const isVideo = filename.toLowerCase().endsWith('.mp4') ||
+                      filename.toLowerCase().endsWith('.mov') ||
+                      filename.toLowerCase().endsWith('.avi')
+
+      const xmlItem: any = {
+        $: { id: item.id },
+      }
+
+      if (isVideo) xmlItem.type = 'video'
+
+      xmlItem.filename = item.filename
+      xmlItem.photo_city = item.city
+
+      if (item.location) xmlItem.photo_loc = item.location
+
+      // Strip "Video: " prefix from caption if it's a video
+      let caption = item.caption
+      if (isVideo && caption.startsWith('Video: ')) {
+        caption = caption.substring(7)
+      }
+      xmlItem.thumb_caption = caption
+
+      if (item.description) xmlItem.photo_desc = item.description
+      if (item.search) xmlItem.search = item.search
+
+      if (item.coordinates) {
+        xmlItem.geo = {
+          lat: item.coordinates[1].toString(),
+          lon: item.coordinates[0].toString(),
+        }
+        if (item.coordinateAccuracy) {
+          xmlItem.geo.accuracy = item.coordinateAccuracy.toString()
+        }
+      }
+
+      if (item.reference && item.reference[0] && item.reference[1]) {
+        // item.reference is [url, name] - need to extract source type from URL
+        const url = item.reference[0]
+        const name = item.reference[1]
+
+        let source = 'wikipedia' // default
+        if (url.includes('facebook.com')) source = 'facebook'
+        else if (url.includes('google.com')) source = 'google'
+        else if (url.includes('instagram.com')) source = 'instagram'
+        else if (url.includes('wikipedia.org')) source = 'wikipedia'
+        else if (url.includes('youtube.com')) source = 'youtube'
+
+        xmlItem.ref = {
+          name,
+          source,
+        }
+      }
+
+      return xmlItem
+    })
+
+    // Transform meta to XML format with snake_case
+    const xmlMeta = {
+      gallery: updatedAlbum.meta.gallery,
+      album_name: updatedAlbum.meta.albumName,
+      album_version: updatedAlbum.meta.albumVersion,
+      marker_zoom: updatedAlbum.meta.geo?.zoom.toString(),
+      cluster_max_zoom: updatedAlbum.meta.clusterMaxZoom,
+    }
+
+    const xmlAlbum = {
+      meta: xmlMeta,
+      item: xmlItems.length === 1 ? xmlItems[0] : xmlItems,
+    }
+
+    // Convert to XML
+    const builder = new xml2js.Builder({
+      rootName: 'album',
+      renderOpts: { pretty: true, indent: '\t' },
+      xmldec: { version: '1.0', encoding: 'UTF-8' },
+    })
+
+    const xml = builder.buildObject(xmlAlbum)
+    setXmlOutput(xml)
+  }
+
   return (
     <>
       <Stack
         direction="row"
         spacing={2}
         sx={{
-          alignItems: 'center',
+          alignItems: 'flex-start',
         }}
       >
         {children}
-        <Stack direction="column">
-          <Input value={item?.filename} />
-          <Input value={item?.city} />
-          <Input value={item?.location ?? ''} />
-          <Input value={item?.caption} />
-          <Input value={item?.description ?? ''} />
-          <Input value={item?.search ?? ''} />
-          <Xml jsonBlob={JSON.stringify(albumEntity)} />
+        <Stack direction="column" spacing={2} sx={{ flex: 1 }}>
+          <Input
+            value={editedItem?.filename ?? ''}
+            readOnly
+            placeholder="Filename"
+          />
+          <Input
+            value={editedItem?.city ?? ''}
+            onChange={(e) => handleFieldChange('city', e.target.value)}
+            placeholder="City"
+          />
+          <Input
+            value={editedItem?.location ?? ''}
+            onChange={(e) => handleFieldChange('location', e.target.value)}
+            placeholder="Location"
+          />
+          <Input
+            value={editedItem?.caption ?? ''}
+            onChange={(e) => handleFieldChange('caption', e.target.value)}
+            placeholder="Caption"
+          />
+          <Textarea
+            value={editedItem?.description ?? ''}
+            onChange={(e) => handleFieldChange('description', e.target.value)}
+            placeholder="Description"
+            minRows={2}
+          />
+          <Input
+            value={editedItem?.search ?? ''}
+            onChange={(e) => handleFieldChange('search', e.target.value)}
+            placeholder="Search keywords"
+          />
+          <Stack direction="row" spacing={1}>
+            <Input
+              value={editedItem?.coordinates?.[0]?.toString() ?? ''}
+              onChange={(e) => {
+                const lat = parseFloat(e.target.value) || null
+                const lon = editedItem?.coordinates?.[1] ?? null
+                setEditedItem(prev => prev ? { ...prev, coordinates: lat !== null && lon !== null ? [lat, lon] : null } : null)
+              }}
+              placeholder="Latitude"
+              type="number"
+              sx={{ flex: 1, minWidth: 0 }}
+            />
+            <Input
+              value={editedItem?.coordinates?.[1]?.toString() ?? ''}
+              onChange={(e) => {
+                const lon = parseFloat(e.target.value) || null
+                const lat = editedItem?.coordinates?.[0] ?? null
+                setEditedItem(prev => prev ? { ...prev, coordinates: lat !== null && lon !== null ? [lat, lon] : null } : null)
+              }}
+              placeholder="Longitude"
+              type="number"
+              sx={{ flex: 1, minWidth: 0 }}
+            />
+            <Input
+              value={editedItem?.coordinateAccuracy?.toString() ?? ''}
+              onChange={(e) => {
+                const accuracy = parseFloat(e.target.value) || null
+                setEditedItem(prev => prev ? { ...prev, coordinateAccuracy: accuracy } : null)
+              }}
+              placeholder="Accuracy"
+              type="number"
+              sx={{ flex: 0.6, minWidth: 0 }}
+            />
+          </Stack>
+          <Stack direction="row" spacing={2}>
+            <Select
+              value={(() => {
+                const url = editedItem?.reference?.[0] ?? ''
+                if (url.includes('facebook.com')) return 'facebook'
+                if (url.includes('google.com')) return 'google'
+                if (url.includes('instagram.com')) return 'instagram'
+                if (url.includes('youtube.com')) return 'youtube'
+                if (url.includes('wikipedia.org')) return 'wikipedia'
+                return ''
+              })()}
+              onChange={(_, value) => {
+                if (!value) {
+                  setEditedItem(prev => prev ? { ...prev, reference: null } : null)
+                  return
+                }
+                const name = editedItem?.reference?.[1] ?? ''
+                const baseUrls: Record<string, string> = {
+                  facebook: 'https://www.facebook.com/',
+                  google: 'https://www.google.com/search?q=',
+                  instagram: 'https://www.instagram.com/',
+                  wikipedia: 'https://en.wikipedia.org/wiki/',
+                  youtube: 'https://www.youtube.com/watch?v=',
+                }
+                const url = baseUrls[value] + name
+                setEditedItem(prev => prev ? { ...prev, reference: name ? [url, name] : null } : null)
+              }}
+              placeholder="Reference Source"
+              sx={{ flex: 1, minWidth: 0 }}
+            >
+              <Option value="">None</Option>
+              <Option value="facebook">Facebook</Option>
+              <Option value="google">Google</Option>
+              <Option value="instagram">Instagram</Option>
+              <Option value="wikipedia">Wikipedia</Option>
+              <Option value="youtube">YouTube</Option>
+            </Select>
+            <Input
+              value={editedItem?.reference?.[1] ?? ''}
+              onChange={(e) => {
+                const name = e.target.value
+                const url = editedItem?.reference?.[0] ?? ''
+                setEditedItem(prev => prev ? { ...prev, reference: name || url ? [url, name] : null } : null)
+              }}
+              placeholder="Reference Name"
+              sx={{ flex: 1, minWidth: 0 }}
+            />
+          </Stack>
+          <Button onClick={generateXml} variant="solid" color="primary">
+            Generate XML
+          </Button>
+          {xmlOutput && (
+            <Textarea
+              value={xmlOutput}
+              readOnly
+              minRows={10}
+              maxRows={20}
+              placeholder="Generated XML will appear here"
+            />
+          )}
+          <Xml jsonBlob={JSON.stringify(albumEntity, null, 2)} />
         </Stack>
       </Stack>
     </>
diff --git a/src/components/AdminAlbum/Thumbs.tsx b/src/components/AdminAlbum/Thumbs.tsx
index 287daf0d..e5f3d0ff 100644
--- a/src/components/AdminAlbum/Thumbs.tsx
+++ b/src/components/AdminAlbum/Thumbs.tsx
@@ -9,7 +9,9 @@ export default function AdminAlbumThumbs(
   { album, setItem }:
   { album: AlbumResponseBody['album'] | undefined, setItem: Dispatch<SetStateAction<ItemState>> },
 ) {
-  if (!album) return <div>Loading...</div>
+  if (!album || !album.items || album.items.length === 0) {
+    return <div>No items found</div>
+  }
 
   return (
     <>
diff --git a/src/models/album.ts b/src/models/album.ts
index b92b7304..2b75308f 100644
--- a/src/models/album.ts
+++ b/src/models/album.ts
@@ -45,27 +45,39 @@ function isValidItem(schema: unknown): schema is Item {
 }
 
 function title(item: XmlItem): string {
-  if (isNotEmpty(item.photoLoc) && isNotEmpty(item.photoCity)) {
-    return `${item.photoLoc} (${item.photoCity})`
+  const photoCity = item.photoCity ?? ''
+  const photoLoc = item.photoLoc ?? ''
+
+  if (isNotEmpty(photoLoc) && isNotEmpty(photoCity)) {
+    return `${photoLoc} (${photoCity})`
+  }
+
+  if (isNotEmpty(photoLoc)) {
+    return photoLoc
   }
 
-  if (isNotEmpty(item.photoLoc)) {
-    return item.photoLoc
+  if (isNotEmpty(photoCity)) {
+    return photoCity
   }
 
-  return item.photoCity
+  // If both are empty, return a default
+  return 'Untitled'
 }
 
 function transformCaption(item: XmlItem, debug: DebugInfo) {
-  if (!('thumbCaption' in item) || item.thumbCaption === '') {
-    throw new ReferenceError(missingXmlMessage('thumb_caption', debug))
+  const thumbCaption = item.thumbCaption ?? ''
+
+  if (thumbCaption === '') {
+    // Use filename as fallback caption
+    const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+    return filename
   }
 
   if (item.type === 'video') {
-    return `Video: ${item.thumbCaption}`
+    return `Video: ${thumbCaption}`
   }
 
-  return item.thumbCaption
+  return thumbCaption
 }
 
 function assertCannotReach(x: never) {
@@ -110,14 +122,16 @@ export const transformReference = (item: XmlItem): [string, string] | null => {
       case 'youtube':
         return 'https://www.youtube.com/watch?v='
       default:
-        return assertCannotReach(source)
+        return null // Return null instead of throwing for unknown sources
     }
   }
   if (!('ref' in item) || !item.ref) {
     return null
   }
   if ('name' in item.ref && 'source' in item.ref) {
-    return [baseUrl(item.ref.source) + item.ref.name, item.ref.name]
+    const url = baseUrl(item.ref.source)
+    if (!url) return null // Return null if source is invalid
+    return [url + item.ref.name, item.ref.name]
   }
   return null
 }
@@ -183,9 +197,8 @@ const transformJsonSchema = (dirty: XmlAlbum, persons: Person[]): Album => {
       filenameId: Array.isArray(filename) ? filename[0] : filename,
     }
 
-    if (!('photoCity' in item)) {
-      throw new ReferenceError(missingXmlMessage('photo_city', debugInfo))
-    }
+    // Allow photoCity to be optional, default to empty string if missing
+    const photoCity = item.photoCity ?? ''
 
     const latitude = item?.geo?.lat ? parseFloat(item.geo.lat) : null
     const longitude = item?.geo?.lon ? parseFloat(item.geo.lon) : null
@@ -199,7 +212,7 @@ const transformJsonSchema = (dirty: XmlAlbum, persons: Person[]): Album => {
       id,
       filename,
       photoDate: photoDate || null,
-      city: item.photoCity,
+      city: photoCity,
       location: item.photoLoc || null,
       caption: transformCaption(item, debugInfo),
       description: item.photoDesc || null,

From 456fb5e0aafabcb94268da87d8d36e2a089d3f8c Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sun, 11 Jan 2026 21:03:06 -0800
Subject: [PATCH 02/33] feat(Admin > Edit Album): Generate XML ready for copy
 and paste

---
 app/api/admin/xml/[gallery]/[album]/route.ts  |  20 ++
 .../AdminAlbum/AdminAlbumClient.tsx           |  15 +-
 src/components/AdminAlbum/Fields.tsx          | 203 ++++++------------
 src/components/AdminAlbum/Photo.tsx           |  13 +-
 src/components/AdminAlbum/Thumbs.tsx          |  36 ++--
 src/components/AdminAlbum/Xml.tsx             |   9 -
 src/lib/paths.ts                              |  57 +++++
 src/lib/xml.ts                                |  19 +-
 src/types/common.d.ts                         |  34 ++-
 9 files changed, 206 insertions(+), 200 deletions(-)
 create mode 100644 app/api/admin/xml/[gallery]/[album]/route.ts
 delete mode 100644 src/components/AdminAlbum/Xml.tsx
 create mode 100644 src/lib/paths.ts

diff --git a/app/api/admin/xml/[gallery]/[album]/route.ts b/app/api/admin/xml/[gallery]/[album]/route.ts
new file mode 100644
index 00000000..a9e75eaf
--- /dev/null
+++ b/app/api/admin/xml/[gallery]/[album]/route.ts
@@ -0,0 +1,20 @@
+import { NextRequest, NextResponse } from 'next/server'
+
+import { rawParseOptions, readAlbum } from '../../../../../../src/lib/xml'
+import type { Gallery, RawXmlAlbum } from '../../../../../../src/types/common'
+
+export async function GET(
+  request: NextRequest,
+  { params }: { params: Promise<{ gallery: string, album: string }> },
+) {
+  const { gallery, album } = await params
+
+  try {
+    // Use existing readAlbum with raw parse options (no camelCase transformation)
+    const xmlAlbum: RawXmlAlbum = await readAlbum(gallery as Gallery, album, rawParseOptions)
+
+    return NextResponse.json(xmlAlbum)
+  } catch (error) {
+    return NextResponse.json({ error: 'Failed to load XML' }, { status: 500 })
+  }
+}
diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index bff2b4d1..90e8f01b 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -6,15 +6,14 @@ import Stack from '@mui/joy/Stack'
 import { useState } from 'react'
 import useSWR from 'swr'
 
-import { type AlbumResponseBody } from '../../lib/album'
 import { type GalleryAlbumsBody } from '../../lib/albums'
 import { type Gallery } from '../../lib/galleries'
-import type { GalleryAlbum, Item } from '../../types/common'
+import type { GalleryAlbum, RawXmlAlbum, RawXmlItem } from '../../types/common'
 import Fields from './Fields'
 import Photo from './Photo'
 import Thumbs from './Thumbs'
 
-export type ItemState = Item | null
+export type XmlItemState = RawXmlItem | null
 
 const fetcher = (url: string) => fetch(url).then(r => r.json())
 
@@ -23,8 +22,8 @@ export default function AdminAlbumClient(
   { galleries: Gallery[], galleryAlbum: GalleryAlbumsBody, gallery: Gallery },
 ) {
   const [album, setAlbum] = useState<GalleryAlbum | null>(null)
-  const [item, setItem] = useState<ItemState>(null)
-  const { data, error } = useSWR<AlbumResponseBody>(album?.name ? `/api/galleries/${gallery}/albums/${album?.name}` : null, fetcher)
+  const [item, setItem] = useState<XmlItemState>(null)
+  const { data, error } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${gallery}/${album?.name}` : null, fetcher)
 
   const handleAlbumChange = (
     event: React.SyntheticEvent | null,
@@ -38,8 +37,8 @@ export default function AdminAlbumClient(
 
   return (
     <form>
-        {item && <Fields albumEntity={data?.album} item={item}>
-          <Photo item={item} />
+        {item && <Fields xmlAlbum={data} gallery={gallery} item={item}>
+          <Photo item={item} gallery={gallery} />
         </Fields>}
         <Stack
           direction="row"
@@ -80,7 +79,7 @@ export default function AdminAlbumClient(
           </Select>
         </Stack>
         {error && <div>{JSON.stringify(error)}</div>}
-        {!error && data && data.album ? <Thumbs album={data.album} setItem={setItem} /> : <div>Select an album</div>}
+        {!error && data ? <Thumbs xmlAlbum={data} gallery={gallery} setItem={setItem} /> : <div>Select an album</div>}
       </form>
   )
 }
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index b5f0abf4..48ab05a0 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -7,16 +7,16 @@ import Textarea from '@mui/joy/Textarea'
 import { useEffect, useState } from 'react'
 import xml2js from 'xml2js'
 
-import { type AlbumResponseBody } from '../../lib/album'
-import type { Item } from '../../types/common'
-import { type ItemState } from './AdminAlbumClient'
-import Xml from './Xml'
+import type { Gallery, ItemReferenceSource, RawXmlAlbum, RawXmlItem } from '../../types/common'
+import { type XmlItemState } from './AdminAlbumClient'
+
+const REFERENCE_SOURCES: ItemReferenceSource[] = ['facebook', 'google', 'instagram', 'wikipedia', 'youtube']
 
 export default function Fields(
-  { albumEntity, item, children }:
-  { albumEntity: AlbumResponseBody['album'] | undefined, item: ItemState, children: React.ReactElement },
+  { xmlAlbum, gallery, item, children }:
+  { xmlAlbum: RawXmlAlbum | undefined, gallery: Gallery, item: XmlItemState, children: React.ReactElement },
 ) {
-  const [editedItem, setEditedItem] = useState<Item | null>(item)
+  const [editedItem, setEditedItem] = useState<RawXmlItem | null>(item)
   const [xmlOutput, setXmlOutput] = useState<string>('')
 
   useEffect(() => {
@@ -24,95 +24,22 @@ export default function Fields(
     setXmlOutput('')
   }, [item])
 
-  const handleFieldChange = (field: keyof Item, value: string) => {
-    if (editedItem) {
-      setEditedItem({ ...editedItem, [field]: value })
-    }
-  }
-
   const generateXml = () => {
-    if (!editedItem || !albumEntity) return
+    if (!editedItem || !xmlAlbum) return
 
-    // Create a copy of the album with the updated item
-    const updatedAlbum = { ...albumEntity }
-    const items = [...updatedAlbum.items]
-    const itemIndex = items.findIndex(i => i?.filename === editedItem.filename)
+    // Get all items from XML
+    const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
 
+    // Update the edited item in the list
+    const itemIndex = items.findIndex(i => i?.$.id === editedItem.$.id)
     if (itemIndex !== -1) {
       items[itemIndex] = editedItem
     }
 
-    // Convert to XML - need to transform back to XML format with snake_case fields
-    const xmlItems = items.map(item => {
-      const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
-      const isVideo = filename.toLowerCase().endsWith('.mp4') ||
-                      filename.toLowerCase().endsWith('.mov') ||
-                      filename.toLowerCase().endsWith('.avi')
-
-      const xmlItem: any = {
-        $: { id: item.id },
-      }
-
-      if (isVideo) xmlItem.type = 'video'
-
-      xmlItem.filename = item.filename
-      xmlItem.photo_city = item.city
-
-      if (item.location) xmlItem.photo_loc = item.location
-
-      // Strip "Video: " prefix from caption if it's a video
-      let caption = item.caption
-      if (isVideo && caption.startsWith('Video: ')) {
-        caption = caption.substring(7)
-      }
-      xmlItem.thumb_caption = caption
-
-      if (item.description) xmlItem.photo_desc = item.description
-      if (item.search) xmlItem.search = item.search
-
-      if (item.coordinates) {
-        xmlItem.geo = {
-          lat: item.coordinates[1].toString(),
-          lon: item.coordinates[0].toString(),
-        }
-        if (item.coordinateAccuracy) {
-          xmlItem.geo.accuracy = item.coordinateAccuracy.toString()
-        }
-      }
-
-      if (item.reference && item.reference[0] && item.reference[1]) {
-        // item.reference is [url, name] - need to extract source type from URL
-        const url = item.reference[0]
-        const name = item.reference[1]
-
-        let source = 'wikipedia' // default
-        if (url.includes('facebook.com')) source = 'facebook'
-        else if (url.includes('google.com')) source = 'google'
-        else if (url.includes('instagram.com')) source = 'instagram'
-        else if (url.includes('wikipedia.org')) source = 'wikipedia'
-        else if (url.includes('youtube.com')) source = 'youtube'
-
-        xmlItem.ref = {
-          name,
-          source,
-        }
-      }
-
-      return xmlItem
-    })
-
-    // Transform meta to XML format with snake_case
-    const xmlMeta = {
-      gallery: updatedAlbum.meta.gallery,
-      album_name: updatedAlbum.meta.albumName,
-      album_version: updatedAlbum.meta.albumVersion,
-      marker_zoom: updatedAlbum.meta.geo?.zoom.toString(),
-      cluster_max_zoom: updatedAlbum.meta.clusterMaxZoom,
-    }
-
-    const xmlAlbum = {
-      meta: xmlMeta,
-      item: xmlItems.length === 1 ? xmlItems[0] : xmlItems,
+    // Build XML album structure
+    const xmlOutput = {
+      meta: xmlAlbum.album.meta,
+      item: items.length === 1 ? items[0] : items,
     }
 
     // Convert to XML
@@ -122,10 +49,12 @@ export default function Fields(
       xmldec: { version: '1.0', encoding: 'UTF-8' },
     })
 
-    const xml = builder.buildObject(xmlAlbum)
+    const xml = builder.buildObject(xmlOutput)
     setXmlOutput(xml)
   }
 
+  const filename = editedItem?.filename ? (Array.isArray(editedItem.filename) ? editedItem.filename[0] : editedItem.filename) : ''
+
   return (
     <>
       <Stack
@@ -138,64 +67,71 @@ export default function Fields(
         {children}
         <Stack direction="column" spacing={2} sx={{ flex: 1 }}>
           <Input
-            value={editedItem?.filename ?? ''}
+            value={filename}
             readOnly
             placeholder="Filename"
           />
           <Input
-            value={editedItem?.city ?? ''}
-            onChange={(e) => handleFieldChange('city', e.target.value)}
+            value={editedItem?.photo_city ?? ''}
+            onChange={(e) => setEditedItem(prev => prev ? { ...prev, photo_city: e.target.value } : null)}
             placeholder="City"
           />
           <Input
-            value={editedItem?.location ?? ''}
-            onChange={(e) => handleFieldChange('location', e.target.value)}
+            value={editedItem?.photo_loc ?? ''}
+            onChange={(e) => setEditedItem(prev => prev ? { ...prev, photo_loc: e.target.value } : null)}
             placeholder="Location"
           />
           <Input
-            value={editedItem?.caption ?? ''}
-            onChange={(e) => handleFieldChange('caption', e.target.value)}
+            value={editedItem?.thumb_caption ?? ''}
+            onChange={(e) => setEditedItem(prev => prev ? { ...prev, thumb_caption: e.target.value } : null)}
             placeholder="Caption"
           />
           <Textarea
-            value={editedItem?.description ?? ''}
-            onChange={(e) => handleFieldChange('description', e.target.value)}
+            value={editedItem?.photo_desc ?? ''}
+            onChange={(e) => setEditedItem(prev => prev ? { ...prev, photo_desc: e.target.value } : null)}
             placeholder="Description"
             minRows={2}
           />
           <Input
             value={editedItem?.search ?? ''}
-            onChange={(e) => handleFieldChange('search', e.target.value)}
+            onChange={(e) => setEditedItem(prev => prev ? { ...prev, search: e.target.value } : null)}
             placeholder="Search keywords"
           />
           <Stack direction="row" spacing={1}>
             <Input
-              value={editedItem?.coordinates?.[0]?.toString() ?? ''}
+              value={editedItem?.geo?.lat ?? ''}
               onChange={(e) => {
-                const lat = parseFloat(e.target.value) || null
-                const lon = editedItem?.coordinates?.[1] ?? null
-                setEditedItem(prev => prev ? { ...prev, coordinates: lat !== null && lon !== null ? [lat, lon] : null } : null)
+                const lat = e.target.value
+                setEditedItem(prev => prev ? {
+                  ...prev,
+                  geo: lat || prev.geo?.lon ? { lat, lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' } : undefined,
+                } : null)
               }}
               placeholder="Latitude"
               type="number"
               sx={{ flex: 1, minWidth: 0 }}
             />
             <Input
-              value={editedItem?.coordinates?.[1]?.toString() ?? ''}
+              value={editedItem?.geo?.lon ?? ''}
               onChange={(e) => {
-                const lon = parseFloat(e.target.value) || null
-                const lat = editedItem?.coordinates?.[0] ?? null
-                setEditedItem(prev => prev ? { ...prev, coordinates: lat !== null && lon !== null ? [lat, lon] : null } : null)
+                const lon = e.target.value
+                setEditedItem(prev => prev ? {
+                  ...prev,
+                  geo: lon || prev.geo?.lat ? { lat: prev.geo?.lat || '', lon, accuracy: prev.geo?.accuracy || '' } : undefined,
+                } : null)
               }}
               placeholder="Longitude"
               type="number"
               sx={{ flex: 1, minWidth: 0 }}
             />
             <Input
-              value={editedItem?.coordinateAccuracy?.toString() ?? ''}
+              value={editedItem?.geo?.accuracy ?? ''}
               onChange={(e) => {
-                const accuracy = parseFloat(e.target.value) || null
-                setEditedItem(prev => prev ? { ...prev, coordinateAccuracy: accuracy } : null)
+                const accuracy = e.target.value
+                setEditedItem(prev => prev ? {
+                  ...prev,
+                  geo: prev.geo ? { ...prev.geo, accuracy } : undefined,
+                } : null)
               }}
               placeholder="Accuracy"
               type="number"
@@ -204,47 +140,29 @@ export default function Fields(
           </Stack>
           <Stack direction="row" spacing={2}>
             <Select
-              value={(() => {
-                const url = editedItem?.reference?.[0] ?? ''
-                if (url.includes('facebook.com')) return 'facebook'
-                if (url.includes('google.com')) return 'google'
-                if (url.includes('instagram.com')) return 'instagram'
-                if (url.includes('youtube.com')) return 'youtube'
-                if (url.includes('wikipedia.org')) return 'wikipedia'
-                return ''
-              })()}
+              value={editedItem?.ref?.source ?? ''}
               onChange={(_, value) => {
-                if (!value) {
-                  setEditedItem(prev => prev ? { ...prev, reference: null } : null)
-                  return
-                }
-                const name = editedItem?.reference?.[1] ?? ''
-                const baseUrls: Record<string, string> = {
-                  facebook: 'https://www.facebook.com/',
-                  google: 'https://www.google.com/search?q=',
-                  instagram: 'https://www.instagram.com/',
-                  wikipedia: 'https://en.wikipedia.org/wiki/',
-                  youtube: 'https://www.youtube.com/watch?v=',
-                }
-                const url = baseUrls[value] + name
-                setEditedItem(prev => prev ? { ...prev, reference: name ? [url, name] : null } : null)
+                setEditedItem(prev => prev ? {
+                  ...prev,
+                  ref: value ? { source: value as ItemReferenceSource, name: prev.ref?.name || '' } : undefined,
+                } : null)
               }}
               placeholder="Reference Source"
               sx={{ flex: 1, minWidth: 0 }}
             >
               <Option value="">None</Option>
-              <Option value="facebook">Facebook</Option>
-              <Option value="google">Google</Option>
-              <Option value="instagram">Instagram</Option>
-              <Option value="wikipedia">Wikipedia</Option>
-              <Option value="youtube">YouTube</Option>
+              {REFERENCE_SOURCES.map(source => (
+                <Option key={source} value={source}>{source.charAt(0).toUpperCase() + source.slice(1)}</Option>
+              ))}
             </Select>
             <Input
-              value={editedItem?.reference?.[1] ?? ''}
+              value={editedItem?.ref?.name ?? ''}
               onChange={(e) => {
                 const name = e.target.value
-                const url = editedItem?.reference?.[0] ?? ''
-                setEditedItem(prev => prev ? { ...prev, reference: name || url ? [url, name] : null } : null)
+                setEditedItem(prev => prev ? {
+                  ...prev,
+                  ref: prev.ref?.source ? { source: prev.ref.source, name } : undefined,
+                } : null)
               }}
               placeholder="Reference Name"
               sx={{ flex: 1, minWidth: 0 }}
@@ -262,7 +180,6 @@ export default function Fields(
               placeholder="Generated XML will appear here"
             />
           )}
-          <Xml jsonBlob={JSON.stringify(albumEntity, null, 2)} />
         </Stack>
       </Stack>
     </>
diff --git a/src/components/AdminAlbum/Photo.tsx b/src/components/AdminAlbum/Photo.tsx
index 973e7d84..89c97b13 100644
--- a/src/components/AdminAlbum/Photo.tsx
+++ b/src/components/AdminAlbum/Photo.tsx
@@ -3,10 +3,11 @@ import Stack from '@mui/joy/Stack'
 import useSWRMutation from 'swr/mutation'
 
 import type { Prediction } from '../../../app/api/admin/classify/route'
+import { photoPath } from '../../lib/paths'
 import config from '../../models/config'
+import type { Gallery, RawXmlItem } from '../../types/common'
 import Img from '../Img'
 import Link from '../Link'
-import type { ItemState } from './AdminAlbumClient'
 
 const fetcher = async (url: string, { arg }: { arg: string }) =>
   fetch(url, {
@@ -15,27 +16,27 @@ const fetcher = async (url: string, { arg }: { arg: string }) =>
     body: JSON.stringify({ path: arg }),
   }).then((res) => res.json())
 
-export default function AdminAlbumPhoto({ item }: { item: ItemState }) {
+export default function AdminAlbumPhoto({ item, gallery }: { item: RawXmlItem, gallery: Gallery }) {
   const { trigger, data, error, isMutating } = useSWRMutation(
     '/api/admin/classify',
     fetcher,
   )
 
-  if (!item?.photoPath) return <div>No photo</div>
+  const path = photoPath(item.filename, gallery)
 
   return (
     <>
       <Stack direction="column">
         <Img
-          src={item.photoPath}
-          alt={item.caption}
+          src={path}
+          alt={item.thumb_caption}
           width={config.resizeDimensions.photo.width-200}
           height={config.resizeDimensions.photo.height-200}
         />
         <Button
           onClick={(e) => {
             e.preventDefault()
-            trigger(item.photoPath)
+            trigger(path)
           }}
         >
           Classify Image
diff --git a/src/components/AdminAlbum/Thumbs.tsx b/src/components/AdminAlbum/Thumbs.tsx
index e5f3d0ff..b0dd4d78 100644
--- a/src/components/AdminAlbum/Thumbs.tsx
+++ b/src/components/AdminAlbum/Thumbs.tsx
@@ -1,31 +1,37 @@
 import { type Dispatch, type SetStateAction } from 'react'
 
-import { AlbumResponseBody } from '../../lib/album'
+import { thumbPath } from '../../lib/paths'
+import type { Gallery, RawXmlAlbum } from '../../types/common'
 import styles from '../Album/styles.module.css'
 import ThumbImg from '../ThumbImg'
-import { ItemState } from './AdminAlbumClient'
+import { XmlItemState } from './AdminAlbumClient'
 
 export default function AdminAlbumThumbs(
-  { album, setItem }:
-  { album: AlbumResponseBody['album'] | undefined, setItem: Dispatch<SetStateAction<ItemState>> },
+  { xmlAlbum, gallery, setItem }:
+  { xmlAlbum: RawXmlAlbum, gallery: Gallery, setItem: Dispatch<SetStateAction<XmlItemState>> },
 ) {
-  if (!album || !album.items || album.items.length === 0) {
+  const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
+
+  if (items.length === 0) {
     return <div>No items found</div>
   }
 
   return (
     <>
       <ul className={styles.thumbWrapper}>
-        {album.items.map((item) => (
-          <ThumbImg
-            onClick={() => setItem(item)}
-            src={item.thumbPath}
-            caption={item.caption}
-            key={item.filename.toString()}
-            id={`select${item.id}`}
-            viewed={false}
-          />
-        ))}
+        {items.map((item) => {
+          const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+          return (
+            <ThumbImg
+              onClick={() => setItem(item)}
+              src={thumbPath(item.filename, gallery)}
+              caption={item.thumb_caption}
+              key={filename}
+              id={`select${item.$.id}`}
+              viewed={false}
+            />
+          )
+        })}
       </ul>
     </>
   )
diff --git a/src/components/AdminAlbum/Xml.tsx b/src/components/AdminAlbum/Xml.tsx
deleted file mode 100644
index 26cbfd6a..00000000
--- a/src/components/AdminAlbum/Xml.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Textarea } from '@mui/joy'
-
-export default function Fields({ jsonBlob }: { jsonBlob: string | undefined }) {
-  return (
-    <>
-      <Textarea defaultValue={jsonBlob} maxRows={5} />
-    </>
-  )
-}
diff --git a/src/lib/paths.ts b/src/lib/paths.ts
new file mode 100644
index 00000000..55e27236
--- /dev/null
+++ b/src/lib/paths.ts
@@ -0,0 +1,57 @@
+import path from 'node:path'
+
+import type { Gallery, Item, XmlItem } from '../types/common'
+
+const type = (filepath: string): string => {
+  if (filepath.lastIndexOf('.') === 0) {
+    return path.parse(filepath).name.substring(1)
+  }
+
+  return path.extname(filepath).substring(1)
+}
+
+const filenameAsJpg = (filename: Item['filename'][0]) => {
+  const currentExt = type(filename)
+  const futureExt = (currentExt.toLowerCase() === 'jpg' || currentExt.toLowerCase() === 'jpeg') ? currentExt : 'jpg'
+  const imageFilename = filename.replace(currentExt, futureExt)
+  return imageFilename
+}
+
+/**
+ * Photo or thumbnail path to public folder on local filesystem
+ * @param {object} filename file plus extension
+ * @param {string} gallery name
+ * @param {string} rasterType photo|thumb
+ * @returns {string} path
+ */
+export const rasterPath = (filename: XmlItem['filename'], gallery: Gallery, rasterType: 'photo' | 'thumb') => {
+  const imageFilename = filenameAsJpg(Array.isArray(filename) ? filename[0] : filename)
+  const year = imageFilename.indexOf('-') >= 0 && imageFilename.split('-')[0]
+
+  return `/galleries/${gallery}/media/${rasterType}s/${year}/${imageFilename}`
+}
+
+/**
+ * Thumbnail path to public folder
+ */
+export const thumbPath = (filename: XmlItem['filename'], gallery: Gallery) => rasterPath(filename, gallery, 'thumb')
+
+/**
+ * Photo path to public folder
+ */
+export const photoPath = (filename: XmlItem['filename'], gallery: Gallery) => rasterPath(filename, gallery, 'photo')
+
+/**
+ * Video paths to public folder on local filesystem
+ * @param {object} filename file plus extension
+ * @param {string} gallery name
+ * @returns {string[]} path
+ */
+export const getVideoPaths = (filename: XmlItem['filename'], gallery: Gallery) => {
+  const filenames = Array.isArray(filename) ? filename : [filename]
+
+  return filenames.map(fn => {
+    const year = fn.indexOf('-') >= 0 && fn.split('-')[0]
+    return `/galleries/${gallery}/media/videos/${year}/${fn}`
+  })
+}
diff --git a/src/lib/xml.ts b/src/lib/xml.ts
index 118307de..4779f8b4 100644
--- a/src/lib/xml.ts
+++ b/src/lib/xml.ts
@@ -3,21 +3,21 @@ import fs from 'node:fs/promises'
 import xml2js, { type ParserOptions } from 'xml2js'
 
 import type {
-  AlbumMeta, Gallery, XmlAlbum, XmlGallery, XmlPersons,
+  AlbumMeta, Gallery, RawXmlAlbum, XmlAlbum, XmlGallery, XmlPersons,
 } from '../types/common'
 
 const parseOptions: ParserOptions = { explicitArray: false, normalizeTags: true, tagNameProcessors: [(name) => camelCase(name)] }
 const parser = new xml2js.Parser(parseOptions)
 
-/**
-* Get Album XML from local filesystem
-* @param {string} gallery name of gallery
-* @param {string} album name of album
-* @returns {string} album XML
-*/
-async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string): Promise<XmlAlbum> {
+const rawParseOptions: ParserOptions = { explicitArray: false }
+const rawParser = new xml2js.Parser(rawParseOptions)
+
+async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string): Promise<XmlAlbum>
+async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string, options: ParserOptions): Promise<RawXmlAlbum>
+async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string, options?: ParserOptions): Promise<XmlAlbum | RawXmlAlbum> {
   const fileBuffer = await fs.readFile(`public/galleries/${gallery}/${album}.xml`)
-  return parser.parseStringPromise(fileBuffer)
+  const selectedParser = options ? new xml2js.Parser(options) : parser
+  return selectedParser.parseStringPromise(fileBuffer)
 }
 
 /**
@@ -41,6 +41,7 @@ async function readPersons(gallery: Gallery): Promise<XmlPersons> {
 }
 
 export {
+  rawParseOptions,
   readAlbum,
   readGallery,
   readPersons,
diff --git a/src/types/common.d.ts b/src/types/common.d.ts
index a504128f..a3af0cda 100644
--- a/src/types/common.d.ts
+++ b/src/types/common.d.ts
@@ -64,18 +64,13 @@ type Item = {
   reference: [string, string] | null,
 }
 
-type XmlItem = {
+type XmlCaseItem<TCamelCase extends boolean = true> = {
   $: {
     id: string,
   },
   type?: 'video' | 'photo',
   size?: { w: string, h: string },
   filename: string | string[],
-  photoDate: string | null,
-  photoCity: string,
-  photoLoc?: string,
-  thumbCaption: string,
-  photoDesc?: string,
   search?: string,
   geo?: {
     lat: string,
@@ -86,12 +81,24 @@ type XmlItem = {
     name: string,
     source: ItemReferenceSource,
   }
-}
-
-type XmlAlbum = {
+} & (TCamelCase extends true ? {
+  photoDate: string | null,
+  photoCity: string,
+  photoLoc?: string,
+  thumbCaption: string,
+  photoDesc?: string,
+} : {
+  photo_date: string | null,
+  photo_city: string,
+  photo_loc?: string,
+  thumb_caption: string,
+  photo_desc?: string,
+})
+
+type XmlCaseAlbum<TCamelCase extends boolean = true> = {
   album: {
     meta?: XmlMeta,
-    item?: XmlItem | XmlItem[]
+    item?: XmlCaseItem<TCamelCase> | XmlCaseItem<TCamelCase>[]
   },
 }
 
@@ -174,6 +181,11 @@ declare global {
   }
 }
 
+type XmlItem = XmlCaseItem<true>
+type RawXmlItem = XmlCaseItem<false>
+type XmlAlbum = XmlCaseAlbum<true>
+type RawXmlAlbum = XmlCaseAlbum<false>
+
 export type {
   Gallery,
   AlbumMeta,
@@ -185,11 +197,13 @@ export type {
   ServerSideAlbumItem,
   ServerSideAllItem,
   XmlItem,
+  RawXmlItem,
   Person,
   PersonItem,
   XmlPerson,
   XmlPersons,
   XmlAlbum,
+  RawXmlAlbum,
   Item,
   ItemReferenceSource,
   IndexedKeywords,

From b29b2aa8cff7b8aad5d44c7eb43c97c54e0d7e56 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sun, 11 Jan 2026 22:14:30 -0800
Subject: [PATCH 03/33] feat(Admin > Edit Album): Keyboard arrows next and prev
 image

---
 .../AdminAlbum/AdminAlbumClient.tsx           | 50 ++++++++++++++++++-
 src/components/AdminAlbum/Fields.tsx          |  2 +-
 src/components/AdminAlbum/Photo.tsx           |  2 +-
 src/components/AdminAlbum/Thumbs.tsx          | 19 ++++---
 src/types/common.d.ts                         |  2 +-
 5 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index 90e8f01b..6387a368 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -3,7 +3,7 @@
 import Option from '@mui/joy/Option'
 import Select from '@mui/joy/Select'
 import Stack from '@mui/joy/Stack'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import useSWR from 'swr'
 
 import { type GalleryAlbumsBody } from '../../lib/albums'
@@ -23,8 +23,50 @@ export default function AdminAlbumClient(
 ) {
   const [album, setAlbum] = useState<GalleryAlbum | null>(null)
   const [item, setItem] = useState<XmlItemState>(null)
+  const [currentIndex, setCurrentIndex] = useState<number>(-1)
   const { data, error } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${gallery}/${album?.name}` : null, fetcher)
 
+  const items = data?.album.item ? (Array.isArray(data.album.item) ? data.album.item : [data.album.item]) : []
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      // Don't trigger if user is typing in an input/textarea
+      const target = e.target as HTMLElement
+      if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA') {
+        return
+      }
+
+      let delta = 0
+
+      if (e.key === 'ArrowLeft') {
+        delta = -1
+      } else if (e.key === 'ArrowUp') {
+        delta = -4
+      } else if (e.key === 'ArrowRight') {
+        delta = 1
+      } else if (e.key === 'ArrowDown') {
+        delta = 4
+      }
+
+      if (delta !== 0 && items.length > 0) {
+        e.preventDefault()
+        const newIndex = Math.max(0, Math.min(items.length - 1, currentIndex + delta))
+        if (newIndex !== currentIndex) {
+          setCurrentIndex(newIndex)
+          setItem(items[newIndex])
+        }
+      }
+    }
+
+    window.addEventListener('keydown', handleKeyDown)
+    return () => window.removeEventListener('keydown', handleKeyDown)
+  }, [currentIndex, items])
+
+  const handleItemSelect = (selectedItem: RawXmlItem, index: number) => {
+    setItem(selectedItem)
+    setCurrentIndex(index)
+  }
+
   const handleAlbumChange = (
     event: React.SyntheticEvent | null,
     newValue: string | null,
@@ -79,7 +121,11 @@ export default function AdminAlbumClient(
           </Select>
         </Stack>
         {error && <div>{JSON.stringify(error)}</div>}
-        {!error && data ? <Thumbs xmlAlbum={data} gallery={gallery} setItem={setItem} /> : <div>Select an album</div>}
+        {!error && data ? (
+          <Thumbs xmlAlbum={data} gallery={gallery} setItem={handleItemSelect} currentIndex={currentIndex} />
+        ) : (
+          <div>Select an album</div>
+        )}
       </form>
   )
 }
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 48ab05a0..24aa0979 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -65,7 +65,7 @@ export default function Fields(
         }}
       >
         {children}
-        <Stack direction="column" spacing={2} sx={{ flex: 1 }}>
+        <Stack direction="column" spacing={2} sx={{ width: '35rem', flexShrink: 0 }}>
           <Input
             value={filename}
             readOnly
diff --git a/src/components/AdminAlbum/Photo.tsx b/src/components/AdminAlbum/Photo.tsx
index 89c97b13..100507ae 100644
--- a/src/components/AdminAlbum/Photo.tsx
+++ b/src/components/AdminAlbum/Photo.tsx
@@ -29,7 +29,7 @@ export default function AdminAlbumPhoto({ item, gallery }: { item: RawXmlItem, g
       <Stack direction="column">
         <Img
           src={path}
-          alt={item.thumb_caption}
+          alt={item.thumb_caption || 'Photo'}
           width={config.resizeDimensions.photo.width-200}
           height={config.resizeDimensions.photo.height-200}
         />
diff --git a/src/components/AdminAlbum/Thumbs.tsx b/src/components/AdminAlbum/Thumbs.tsx
index b0dd4d78..94302d1c 100644
--- a/src/components/AdminAlbum/Thumbs.tsx
+++ b/src/components/AdminAlbum/Thumbs.tsx
@@ -1,14 +1,11 @@
-import { type Dispatch, type SetStateAction } from 'react'
-
 import { thumbPath } from '../../lib/paths'
-import type { Gallery, RawXmlAlbum } from '../../types/common'
+import type { Gallery, RawXmlAlbum, RawXmlItem } from '../../types/common'
 import styles from '../Album/styles.module.css'
 import ThumbImg from '../ThumbImg'
-import { XmlItemState } from './AdminAlbumClient'
 
 export default function AdminAlbumThumbs(
-  { xmlAlbum, gallery, setItem }:
-  { xmlAlbum: RawXmlAlbum, gallery: Gallery, setItem: Dispatch<SetStateAction<XmlItemState>> },
+  { xmlAlbum, gallery, setItem, currentIndex }:
+  { xmlAlbum: RawXmlAlbum, gallery: Gallery, setItem: (item: RawXmlItem, index: number) => void, currentIndex: number },
 ) {
   const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
 
@@ -19,16 +16,18 @@ export default function AdminAlbumThumbs(
   return (
     <>
       <ul className={styles.thumbWrapper}>
-        {items.map((item) => {
+        {items.map((item, index) => {
           const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+          const caption = item.thumb_caption || filename
+          const isSelected = index === currentIndex
           return (
             <ThumbImg
-              onClick={() => setItem(item)}
+              onClick={() => setItem(item, index)}
               src={thumbPath(item.filename, gallery)}
-              caption={item.thumb_caption}
+              caption={caption}
               key={filename}
               id={`select${item.$.id}`}
-              viewed={false}
+              viewed={isSelected}
             />
           )
         })}
diff --git a/src/types/common.d.ts b/src/types/common.d.ts
index a3af0cda..1ed8971d 100644
--- a/src/types/common.d.ts
+++ b/src/types/common.d.ts
@@ -91,7 +91,7 @@ type XmlCaseItem<TCamelCase extends boolean = true> = {
   photo_date: string | null,
   photo_city: string,
   photo_loc?: string,
-  thumb_caption: string,
+  thumb_caption?: string,
   photo_desc?: string,
 })
 

From 937a8f2b2f464f13834b1bb13ae69911448c3c60 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Mon, 12 Jan 2026 19:06:02 -0800
Subject: [PATCH 04/33] feat(Admin > Edit Album): Add filename filter before
 Gallery/Album dropdown

---
 app/api/admin/search/route.ts                 |  65 +++++++++++
 .../AdminAlbum/AdminAlbumClient.tsx           | 107 ++++++++++++++++--
 2 files changed, 164 insertions(+), 8 deletions(-)
 create mode 100644 app/api/admin/search/route.ts

diff --git a/app/api/admin/search/route.ts b/app/api/admin/search/route.ts
new file mode 100644
index 00000000..db2e58d5
--- /dev/null
+++ b/app/api/admin/search/route.ts
@@ -0,0 +1,65 @@
+import { NextRequest, NextResponse } from 'next/server'
+
+import getAlbums from '../../../../src/lib/albums'
+import { rawParseOptions, readAlbum } from '../../../../src/lib/xml'
+import type { AlbumMeta, Gallery, Item, RawXmlAlbum, RawXmlItem } from '../../../../src/types/common.d'
+
+export type SearchResult = {
+  gallery: Gallery;
+  album: AlbumMeta['albumName'];
+  filename: Item['filename'];
+  index: number;
+}
+
+export async function GET(request: NextRequest) {
+  const { searchParams } = new URL(request.url)
+  const query = searchParams.get('query')
+
+  if (!query) {
+    return NextResponse.json({ error: 'Query parameter is required' }, { status: 400 })
+  }
+
+  try {
+    // Get all galleries and albums
+    const galleryAlbum = await getAlbums()
+    const results: SearchResult[] = []
+
+    // Search through all galleries and albums
+    for (const gallery of Object.keys(galleryAlbum) as Gallery[]) {
+      const albums = galleryAlbum[gallery].albums
+
+      for (const album of albums) {
+        try {
+          // Read the album XML
+          const xmlAlbum: RawXmlAlbum = await readAlbum(gallery, album.name, rawParseOptions)
+          const items = xmlAlbum?.album?.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
+
+          // Search through items for matching filenames
+          items.forEach((item: RawXmlItem, index: number) => {
+            const filenames = Array.isArray(item.filename) ? item.filename : [item.filename]
+            const hasMatch = filenames.some((filename: string) =>
+              filename.toLowerCase().includes(query.toLowerCase()),
+            )
+
+            if (hasMatch) {
+              results.push({
+                gallery,
+                album: album.name,
+                filename: Array.isArray(item.filename) ? item.filename[0] : item.filename,
+                index,
+              })
+            }
+          })
+        } catch (error) {
+          // Skip albums that can't be read
+          console.error(`Error reading album ${gallery}/${album.name}:`, error)
+        }
+      }
+    }
+
+    return NextResponse.json({ results })
+  } catch (error) {
+    console.error('Search error:', error)
+    return NextResponse.json({ error: 'Search failed' }, { status: 500 })
+  }
+}
diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index 6387a368..2404f624 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -1,11 +1,14 @@
 'use client'
 
+import Button from '@mui/joy/Button'
+import Input from '@mui/joy/Input'
 import Option from '@mui/joy/Option'
 import Select from '@mui/joy/Select'
 import Stack from '@mui/joy/Stack'
 import { useEffect, useState } from 'react'
 import useSWR from 'swr'
 
+import type { SearchResult } from '../../../app/api/admin/search/route'
 import { type GalleryAlbumsBody } from '../../lib/albums'
 import { type Gallery } from '../../lib/galleries'
 import type { GalleryAlbum, RawXmlAlbum, RawXmlItem } from '../../types/common'
@@ -21,10 +24,14 @@ export default function AdminAlbumClient(
   { galleries, galleryAlbum, gallery }:
   { galleries: Gallery[], galleryAlbum: GalleryAlbumsBody, gallery: Gallery },
 ) {
+  const [currentGallery, setCurrentGallery] = useState<Gallery>(gallery)
   const [album, setAlbum] = useState<GalleryAlbum | null>(null)
   const [item, setItem] = useState<XmlItemState>(null)
   const [currentIndex, setCurrentIndex] = useState<number>(-1)
-  const { data, error } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${gallery}/${album?.name}` : null, fetcher)
+  const [searchQuery, setSearchQuery] = useState<string>('')
+  const [searchResults, setSearchResults] = useState<SearchResult[]>([])
+  const [isSearching, setIsSearching] = useState(false)
+  const { data, error, mutate } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${currentGallery}/${album?.name}` : null, fetcher)
 
   const items = data?.album.item ? (Array.isArray(data.album.item) ? data.album.item : [data.album.item]) : []
 
@@ -71,17 +78,100 @@ export default function AdminAlbumClient(
     event: React.SyntheticEvent | null,
     newValue: string | null,
   ) => {
-    const selectedAlbum = galleryAlbum[gallery].albums.find(a => a.name === newValue)
+    const selectedAlbum = galleryAlbum[currentGallery].albums.find(a => a.name === newValue)
     if (selectedAlbum) {
       setAlbum(selectedAlbum)
+      setCurrentIndex(-1)
+      setItem(null)
     }
   }
 
+  const handleGalleryChange = (
+    event: React.SyntheticEvent | null,
+    newValue: string | null,
+  ) => {
+    if (newValue) {
+      setCurrentGallery(newValue as Gallery)
+      setAlbum(null)
+      setItem(null)
+      setCurrentIndex(-1)
+    }
+  }
+
+  const handleSearch = async () => {
+    if (!searchQuery.trim()) return
+
+    setIsSearching(true)
+    try {
+      const response = await fetch(`/api/admin/search?query=${encodeURIComponent(searchQuery)}`)
+      const data: { results: SearchResult[] } = await response.json()
+
+      if (data.results && data.results.length > 0) {
+        setSearchResults(data.results)
+        // Load the first result automatically
+        const firstResult = data.results[0]
+        setCurrentGallery(firstResult.gallery)
+
+        const selectedAlbum = galleryAlbum[firstResult.gallery].albums.find(a => a.name === firstResult.album)
+        if (selectedAlbum) {
+          setAlbum(selectedAlbum)
+          // Wait for the album to load, then select the item
+          setTimeout(async () => {
+            await mutate()
+            setCurrentIndex(firstResult.index)
+          }, 100)
+        }
+      } else {
+        alert('No matching files found')
+      }
+    } catch (error) {
+      console.error('Search failed:', error)
+      alert('Search failed')
+    } finally {
+      setIsSearching(false)
+    }
+  }
+
+  const handleSearchKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
+    if (e.key === 'Enter') {
+      e.preventDefault()
+      handleSearch()
+    }
+  }
+
+  // Update the item when currentIndex changes and items are available
+  useEffect(() => {
+    if (items.length > 0 && currentIndex >= 0 && currentIndex < items.length) {
+      setItem(items[currentIndex])
+    }
+  }, [currentIndex, items])
+
   return (
     <form>
-        {item && <Fields xmlAlbum={data} gallery={gallery} item={item}>
-          <Photo item={item} gallery={gallery} />
+        {item && <Fields xmlAlbum={data} gallery={currentGallery} item={item}>
+          <Photo item={item} gallery={currentGallery} />
         </Fields>}
+        <Stack
+          direction="row"
+          spacing={2}
+          sx={{
+            alignItems: 'center',
+            marginBottom: 2,
+          }}
+        >
+          <label htmlFor="search-filename">Search Filename</label>
+          <Input
+            id="search-filename"
+            placeholder="Enter filename..."
+            value={searchQuery}
+            onChange={(e) => setSearchQuery(e.target.value)}
+            onKeyDown={handleSearchKeyDown}
+            sx={{ flexGrow: 1 }}
+          />
+          <Button onClick={handleSearch} disabled={isSearching} variant="solid">
+            {isSearching ? 'Searching...' : 'Search'}
+          </Button>
+        </Stack>
         <Stack
           direction="row"
           spacing={2}
@@ -91,7 +181,8 @@ export default function AdminAlbumClient(
         >
           <label htmlFor="select-gallery-label" id="select-gallery">Gallery</label>
           <Select
-            defaultValue={gallery}
+            value={currentGallery}
+            onChange={handleGalleryChange}
             slotProps={{
               button: {
                 id: 'select-gallery-label',
@@ -106,7 +197,7 @@ export default function AdminAlbumClient(
 
           <label htmlFor="select-album-label" id="select-album">Album</label>
           <Select
-            defaultValue=""
+            value={album?.name ?? ''}
             onChange={handleAlbumChange}
             slotProps={{
               button: {
@@ -117,12 +208,12 @@ export default function AdminAlbumClient(
             variant='solid'
           >
             <Option value="">Select a Album</Option>
-            {galleryAlbum[gallery].albums.map(album => <Option key={album.name} value={album.name}>{album.name}</Option>)}
+            {galleryAlbum[currentGallery].albums.map(album => <Option key={album.name} value={album.name}>{album.name}</Option>)}
           </Select>
         </Stack>
         {error && <div>{JSON.stringify(error)}</div>}
         {!error && data ? (
-          <Thumbs xmlAlbum={data} gallery={gallery} setItem={handleItemSelect} currentIndex={currentIndex} />
+          <Thumbs xmlAlbum={data} gallery={currentGallery} setItem={handleItemSelect} currentIndex={currentIndex} />
         ) : (
           <div>Select an album</div>
         )}

From 8bc1696d4cc594ac684fb782f7eb8f9cc141fcde Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Mon, 12 Jan 2026 19:44:34 -0800
Subject: [PATCH 05/33] feat(Admin > Edit Album): Refactor all keyword items

---
 src/lib/all.ts           |  60 +----------------------
 src/lib/get-all-items.ts | 103 +++++++++++++++++++++++++++++++++++++++
 src/lib/persons.ts       |  42 ++--------------
 3 files changed, 108 insertions(+), 97 deletions(-)
 create mode 100644 src/lib/get-all-items.ts

diff --git a/src/lib/all.ts b/src/lib/all.ts
index 6632a807..6416422f 100644
--- a/src/lib/all.ts
+++ b/src/lib/all.ts
@@ -1,62 +1,6 @@
-import getAlbum from '../lib/album'
-import getAlbums from '../lib/albums'
-import indexKeywords, { addGeographyToSearch } from '../lib/search'
-import config from '../models/config'
-import type { AlbumMeta, Item, ServerSideAllItem } from '../types/common'
+import { getAllItems, allPageItemMapper } from './get-all-items'
 import type { All } from '../types/pages'
 
 export async function getAllData({ gallery }: All.Params): Promise<All.ItemData> {
-  const { [gallery]: { albums } } = await getAlbums(gallery)
-
-  const prepareItems = (
-    { albumName, albumCoordinateAccuracy, items }:
-    { albumName: AlbumMeta['albumName']; albumCoordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom']; items: Item[] },
-  ) => items.map((item) => {
-    const filenameStr = Array.isArray(item.filename) ? (item.filename[0] ?? '') : (item.filename ?? '')
-    const titleStr = Array.isArray(item.title) ? (item.title[0] ?? '') : (item.title ?? '')
-    const searchStr = addGeographyToSearch(item) ?? ''
-    const corpus = [
-      item.description ?? '',
-      item.caption ?? '',
-      item.location ?? '',
-      item.city ?? '',
-      searchStr,
-    ].join(' ').trim()
-
-    return {
-      id: item.id,
-      filename: filenameStr,
-      photoDate: item.photoDate,
-      city: item.city,
-      location: item.location,
-      description: item.description,
-      caption: item.caption,
-      persons: item.persons,
-      coordinates: item.coordinates,
-      coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
-      thumbPath: item.thumbPath,
-      photoPath: item.photoPath,
-      mediaPath: item.mediaPath,
-      reference: null,
-      videoPaths: null,
-      gallery,
-      album: albumName,
-      title: titleStr,
-      corpus,
-      search: searchStr,
-    }
-  })
-
-  const allItems = (await albums.reduce(async (prevP, album) => {
-    const prev = await prevP
-    const { album: { items, meta } } = await getAlbum(gallery, album.name)
-    const albumCoordinateAccuracy = meta?.geo?.zoom ?? config.defaultZoom
-    const preparedItems = prepareItems({ albumName: album.name, albumCoordinateAccuracy, items })
-    return prev.concat(preparedItems.reverse())
-  }, Promise.resolve([] as ServerSideAllItem[]))).reverse()
-
-  // indexKeywords will run on slim items; keep keyword index small too
-  const { indexedKeywords } = indexKeywords(allItems)
-
-  return { items: allItems, indexedKeywords }
+  return getAllItems(gallery, allPageItemMapper, true)
 }
diff --git a/src/lib/get-all-items.ts b/src/lib/get-all-items.ts
new file mode 100644
index 00000000..b71e99f5
--- /dev/null
+++ b/src/lib/get-all-items.ts
@@ -0,0 +1,103 @@
+import getAlbum from '../lib/album'
+import getAlbums from '../lib/albums'
+import indexKeywords, { addGeographyToSearch } from '../lib/search'
+import config from '../models/config'
+import type { AlbumMeta, Gallery, Item, ServerSideAllItem } from '../types/common'
+import type { All } from '../types/pages'
+
+type PrepareItemsParams = {
+  albumName: AlbumMeta['albumName']
+  albumCoordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom']
+  items: Item[]
+  gallery: Gallery
+}
+
+type ItemMapper = (params: PrepareItemsParams) => ServerSideAllItem[]
+
+/**
+ * Shared utility to get all items from albums with indexed keywords
+ * @param gallery Gallery name
+ * @param itemMapper Custom function to map items to ServerSideAllItem format
+ * @param reverseAlbumItems Whether to reverse items within each album
+ * @returns Items and indexed keywords
+ */
+export async function getAllItems(
+  gallery: Gallery,
+  itemMapper: ItemMapper,
+  reverseAlbumItems = false,
+): Promise<All.ItemData> {
+  const { [gallery]: { albums } } = await getAlbums(gallery)
+
+  const allItems = (await albums.reduce(async (prevP, album) => {
+    const prev = await prevP
+    const { album: { items, meta } } = await getAlbum(gallery, album.name)
+    const albumCoordinateAccuracy = meta?.geo?.zoom ?? config.defaultZoom
+    const preparedItems = itemMapper({
+      albumName: album.name,
+      albumCoordinateAccuracy,
+      items,
+      gallery,
+    })
+    const itemsToConcat = reverseAlbumItems ? preparedItems.reverse() : preparedItems
+    return prev.concat(itemsToConcat)
+  }, Promise.resolve([] as ServerSideAllItem[]))).reverse()
+
+  const { indexedKeywords } = indexKeywords(allItems)
+
+  return { items: allItems, indexedKeywords }
+}
+
+/**
+ * Item mapper for /all page - creates detailed items with all fields
+ */
+export function allPageItemMapper({ albumName, albumCoordinateAccuracy, items, gallery }: PrepareItemsParams): ServerSideAllItem[] {
+  return items.map((item) => {
+    const filenameStr = Array.isArray(item.filename) ? (item.filename[0] ?? '') : (item.filename ?? '')
+    const titleStr = Array.isArray(item.title) ? (item.title[0] ?? '') : (item.title ?? '')
+    const searchStr = addGeographyToSearch(item) ?? ''
+    const corpus = [
+      item.description ?? '',
+      item.caption ?? '',
+      item.location ?? '',
+      item.city ?? '',
+      searchStr,
+    ].join(' ').trim()
+
+    return {
+      id: item.id,
+      filename: filenameStr,
+      photoDate: item.photoDate,
+      city: item.city,
+      location: item.location,
+      description: item.description,
+      caption: item.caption,
+      persons: item.persons,
+      coordinates: item.coordinates,
+      coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
+      thumbPath: item.thumbPath,
+      photoPath: item.photoPath,
+      mediaPath: item.mediaPath,
+      reference: null,
+      videoPaths: null,
+      gallery,
+      album: albumName,
+      title: titleStr,
+      corpus,
+      search: searchStr,
+    }
+  })
+}
+
+/**
+ * Item mapper for /persons page - uses spread operator for simpler mapping
+ */
+export function personsPageItemMapper({ albumName, albumCoordinateAccuracy, items, gallery }: PrepareItemsParams): ServerSideAllItem[] {
+  return items.map((item) => ({
+    ...item,
+    gallery,
+    album: albumName,
+    corpus: [item.description, item.caption, item.location, item.city, item.search].join(' '),
+    coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
+    search: addGeographyToSearch(item),
+  }))
+}
diff --git a/src/lib/persons.ts b/src/lib/persons.ts
index 07500fda..e75192a6 100644
--- a/src/lib/persons.ts
+++ b/src/lib/persons.ts
@@ -1,9 +1,6 @@
-import getAlbum from '../lib/album'
-import getAlbums from '../lib/albums'
-import indexKeywords, { addGeographyToSearch } from '../lib/search'
-import config from '../models/config'
+import { getAllItems, personsPageItemMapper } from './get-all-items'
 import transformJsonSchema, { errorSchema, type ErrorOptionalMessage } from '../models/person'
-import type { AlbumMeta, Gallery, Item, Person, ServerSideAllItem } from '../types/common'
+import type { Gallery, Person } from '../types/common'
 import type { All } from '../types/pages'
 import { handleLibraryError } from './utils'
 import { readPersons } from './xml'
@@ -46,40 +43,7 @@ async function get(
 }
 
 export async function getPersonsData({ gallery }: All.Params): Promise<All.ItemData> {
-  const { [gallery]: { albums } } = await getAlbums(gallery)
-
-  const prepareItems = (
-    { albumName, albumCoordinateAccuracy, items }:
-    {
-      albumName: AlbumMeta['albumName'],
-      albumCoordinateAccuracy: NonNullable<AlbumMeta['geo']>['zoom'],
-      items: Item[],
-    },
-  ) => items.map((item) => ({
-    ...item,
-    gallery,
-    album: albumName,
-    corpus: [item.description, item.caption, item.location, item.city, item.search].join(' '),
-    coordinateAccuracy: item.coordinateAccuracy ?? albumCoordinateAccuracy,
-    search: addGeographyToSearch(item),
-  }))
-
-  // reverse order for albums in ascending order (oldest on top)
-  const allItems = (await albums.reduce(async (previousPromise, album) => {
-    const prev = await previousPromise
-    const { album: { items, meta } } = await getAlbum(gallery, album.name)
-    const albumCoordinateAccuracy = meta?.geo?.zoom ?? config.defaultZoom
-    const preparedItems = prepareItems({
-      albumName: album.name,
-      albumCoordinateAccuracy,
-      items,
-    })
-    return prev.concat(preparedItems)
-  }, Promise.resolve([] as ServerSideAllItem[]))).reverse()
-
-  return {
-    items: allItems, ...indexKeywords(allItems),
-  }
+  return getAllItems(gallery, personsPageItemMapper, false)
 }
 
 export default get

From 585ef578b22ea972f10939368cbee762d4fbff53 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Mon, 12 Jan 2026 20:54:23 -0800
Subject: [PATCH 06/33] feat(Admin > Edit Album): Add keyword autocomplete

---
 app/api/admin/keywords/route.ts      | 13 ++++++++++
 src/components/AdminAlbum/Fields.tsx | 32 ++++++++++++++++++++++-
 src/lib/get-all-items.ts             | 39 +++++++++++++++++++++++++---
 3 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 app/api/admin/keywords/route.ts

diff --git a/app/api/admin/keywords/route.ts b/app/api/admin/keywords/route.ts
new file mode 100644
index 00000000..be33fe66
--- /dev/null
+++ b/app/api/admin/keywords/route.ts
@@ -0,0 +1,13 @@
+import { NextResponse } from 'next/server'
+
+import { getAllKeywords } from '../../../../src/lib/get-all-items'
+
+export async function GET() {
+  try {
+    const { indexedKeywords } = await getAllKeywords()
+    return NextResponse.json({ keywords: indexedKeywords })
+  } catch (error) {
+    console.error('Failed to get keywords:', error)
+    return NextResponse.json({ error: 'Failed to get keywords' }, { status: 500 })
+  }
+}
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 24aa0979..8143a0e9 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -5,11 +5,15 @@ import Select from '@mui/joy/Select'
 import Stack from '@mui/joy/Stack'
 import Textarea from '@mui/joy/Textarea'
 import { useEffect, useState } from 'react'
+import useSWR from 'swr'
 import xml2js from 'xml2js'
 
-import type { Gallery, ItemReferenceSource, RawXmlAlbum, RawXmlItem } from '../../types/common'
+import type { Gallery, IndexedKeywords, ItemReferenceSource, RawXmlAlbum, RawXmlItem } from '../../types/common'
+import ComboBox from '../ComboBox'
 import { type XmlItemState } from './AdminAlbumClient'
 
+const fetcher = (url: string) => fetch(url).then(r => r.json())
+
 const REFERENCE_SOURCES: ItemReferenceSource[] = ['facebook', 'google', 'instagram', 'wikipedia', 'youtube']
 
 export default function Fields(
@@ -18,10 +22,16 @@ export default function Fields(
 ) {
   const [editedItem, setEditedItem] = useState<RawXmlItem | null>(item)
   const [xmlOutput, setXmlOutput] = useState<string>('')
+  const [autocompleteValue, setAutocompleteValue] = useState<string>('')
+
+  // Fetch all available keywords from all albums
+  const { data: keywordsData } = useSWR<{ keywords: IndexedKeywords[] }>('/api/admin/keywords', fetcher)
+  const allKeywords = keywordsData?.keywords ?? []
 
   useEffect(() => {
     setEditedItem(item)
     setXmlOutput('')
+    setAutocompleteValue('')
   }, [item])
 
   const generateXml = () => {
@@ -97,6 +107,26 @@ export default function Fields(
             onChange={(e) => setEditedItem(prev => prev ? { ...prev, search: e.target.value } : null)}
             placeholder="Search keywords"
           />
+          <ComboBox
+            className="keyword-autocomplete"
+            options={allKeywords}
+            value={null}
+            inputValue={autocompleteValue}
+            onInputChange={(newValue) => {
+              setAutocompleteValue(newValue)
+            }}
+            onChange={({ value }) => {
+              // Append the selected keyword to the existing search field
+              setEditedItem(prev => {
+                if (!prev) return null
+                const currentSearch = prev.search ?? ''
+                const separator = currentSearch && !currentSearch.endsWith(', ') ? ', ' : ''
+                return { ...prev, search: currentSearch + separator + value }
+              })
+              // Clear the autocomplete input
+              setAutocompleteValue('')
+            }}
+          />
           <Stack direction="row" spacing={1}>
             <Input
               value={editedItem?.geo?.lat ?? ''}
diff --git a/src/lib/get-all-items.ts b/src/lib/get-all-items.ts
index b71e99f5..e28fd5eb 100644
--- a/src/lib/get-all-items.ts
+++ b/src/lib/get-all-items.ts
@@ -1,5 +1,6 @@
 import getAlbum from '../lib/album'
 import getAlbums from '../lib/albums'
+import getGalleries from '../lib/galleries'
 import indexKeywords, { addGeographyToSearch } from '../lib/search'
 import config from '../models/config'
 import type { AlbumMeta, Gallery, Item, ServerSideAllItem } from '../types/common'
@@ -16,10 +17,10 @@ type ItemMapper = (params: PrepareItemsParams) => ServerSideAllItem[]
 
 /**
  * Shared utility to get all items from albums with indexed keywords
- * @param gallery Gallery name
- * @param itemMapper Custom function to map items to ServerSideAllItem format
- * @param reverseAlbumItems Whether to reverse items within each album
- * @returns Items and indexed keywords
+ * @param {Gallery} gallery Gallery name
+ * @param {ItemMapper} itemMapper Custom function to map items to ServerSideAllItem format
+ * @param {boolean} reverseAlbumItems Whether to reverse items within each album
+ * @returns {Promise<All.ItemData>} Items and indexed keywords
  */
 export async function getAllItems(
   gallery: Gallery,
@@ -101,3 +102,33 @@ export function personsPageItemMapper({ albumName, albumCoordinateAccuracy, item
     search: addGeographyToSearch(item),
   }))
 }
+
+/**
+ * Get all keywords from all galleries and albums
+ * @returns {Promise<{ indexedKeywords: ReturnType<typeof indexKeywords>['indexedKeywords'] }>} Indexed keywords with counts
+ */
+export async function getAllKeywords(): Promise<{ indexedKeywords: ReturnType<typeof indexKeywords>['indexedKeywords'] }> {
+  const { galleries } = await getGalleries()
+  const allItems: { search: Item['search'] }[] = []
+
+  // Collect search keywords from all galleries
+  for (const gallery of galleries) {
+    const { [gallery]: { albums } } = await getAlbums(gallery)
+
+    for (const album of albums) {
+      try {
+        const { album: { items } } = await getAlbum(gallery, album.name)
+        items.forEach((item) => {
+          if (item.search) {
+            allItems.push({ search: item.search })
+          }
+        })
+      } catch (error) {
+        console.error(`Failed to read album ${album.name} in gallery ${gallery}:`, error)
+      }
+    }
+  }
+
+  const { indexedKeywords } = indexKeywords(allItems)
+  return { indexedKeywords }
+}

From 161986f0df27558d83a60261795d4a314a698aa2 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Mon, 12 Jan 2026 21:22:49 -0800
Subject: [PATCH 07/33] fix(Admin > Edit Album): Fix the XML order

---
 .../AdminAlbum/AdminAlbumClient.tsx           |  9 +-------
 src/components/AdminAlbum/Fields.tsx          | 23 +++++++++++++++++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index 2404f624..6c9b0815 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -171,14 +171,7 @@ export default function AdminAlbumClient(
           <Button onClick={handleSearch} disabled={isSearching} variant="solid">
             {isSearching ? 'Searching...' : 'Search'}
           </Button>
-        </Stack>
-        <Stack
-          direction="row"
-          spacing={2}
-          sx={{
-            alignItems: 'center',
-          }}
-        >
+
           <label htmlFor="select-gallery-label" id="select-gallery">Gallery</label>
           <Select
             value={currentGallery}
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 8143a0e9..319af49b 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -40,10 +40,18 @@ export default function Fields(
     // Get all items from XML
     const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
 
-    // Update the edited item in the list
+    // Update the edited item in the list with proper field ordering
     const itemIndex = items.findIndex(i => i?.$.id === editedItem.$.id)
     if (itemIndex !== -1) {
-      items[itemIndex] = editedItem
+      // Reconstruct item with desired field order: search before geo
+      const { search, geo, ref, ...rest } = editedItem
+      const orderedItem: RawXmlItem = {
+        ...rest,
+        ...(search !== undefined && search !== null && { search }),
+        ...(geo && { geo }),
+        ...(ref && { ref }),
+      }
+      items[itemIndex] = orderedItem
     }
 
     // Build XML album structure
@@ -80,32 +88,38 @@ export default function Fields(
             value={filename}
             readOnly
             placeholder="Filename"
+            title="Filename (read-only)"
           />
           <Input
             value={editedItem?.photo_city ?? ''}
             onChange={(e) => setEditedItem(prev => prev ? { ...prev, photo_city: e.target.value } : null)}
             placeholder="City"
+            title="City (photo_city)"
           />
           <Input
             value={editedItem?.photo_loc ?? ''}
             onChange={(e) => setEditedItem(prev => prev ? { ...prev, photo_loc: e.target.value } : null)}
             placeholder="Location"
+            title="Location (photo_loc)"
           />
           <Input
             value={editedItem?.thumb_caption ?? ''}
             onChange={(e) => setEditedItem(prev => prev ? { ...prev, thumb_caption: e.target.value } : null)}
             placeholder="Caption"
+            title="Caption (thumb_caption)"
           />
           <Textarea
             value={editedItem?.photo_desc ?? ''}
             onChange={(e) => setEditedItem(prev => prev ? { ...prev, photo_desc: e.target.value } : null)}
             placeholder="Description"
+            title="Description (photo_desc)"
             minRows={2}
           />
           <Input
             value={editedItem?.search ?? ''}
             onChange={(e) => setEditedItem(prev => prev ? { ...prev, search: e.target.value } : null)}
             placeholder="Search keywords"
+            title="Search keywords (comma-separated)"
           />
           <ComboBox
             className="keyword-autocomplete"
@@ -138,6 +152,7 @@ export default function Fields(
                 } : null)
               }}
               placeholder="Latitude"
+              title="Latitude (geo.lat)"
               type="number"
               sx={{ flex: 1, minWidth: 0 }}
             />
@@ -151,6 +166,7 @@ export default function Fields(
                 } : null)
               }}
               placeholder="Longitude"
+              title="Longitude (geo.lon)"
               type="number"
               sx={{ flex: 1, minWidth: 0 }}
             />
@@ -164,6 +180,7 @@ export default function Fields(
                 } : null)
               }}
               placeholder="Accuracy"
+              title="Coordinate accuracy (geo.accuracy)"
               type="number"
               sx={{ flex: 0.6, minWidth: 0 }}
             />
@@ -178,6 +195,7 @@ export default function Fields(
                 } : null)
               }}
               placeholder="Reference Source"
+              title="Reference source (ref.source)"
               sx={{ flex: 1, minWidth: 0 }}
             >
               <Option value="">None</Option>
@@ -195,6 +213,7 @@ export default function Fields(
                 } : null)
               }}
               placeholder="Reference Name"
+              title="Reference name/ID (ref.name)"
               sx={{ flex: 1, minWidth: 0 }}
             />
           </Stack>

From ec439b26b2859286f820c620f5d1753019ff151a Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 13 Jan 2026 18:09:18 -0800
Subject: [PATCH 08/33] chore(Slippy Map): Optimize with less iteration

---
 src/components/SlippyMap/options.ts | 2 +-
 src/lib/generate-clusters.ts        | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/SlippyMap/options.ts b/src/components/SlippyMap/options.ts
index 813449eb..4b897879 100644
--- a/src/components/SlippyMap/options.ts
+++ b/src/components/SlippyMap/options.ts
@@ -76,7 +76,7 @@ export function transformSourceOptions(
     const { latitude: selectedLatitude, longitude: selectedLongitude } = validatePoint(selected.coordinates)
 
     const baseKey = getCachedH3Index(item)
-    const commonLabel = baseKey && computed.labels[baseKey]?.[resolution] || getLabelForResolution(item, resolution)
+    const commonLabel = (baseKey && computed.labels[baseKey]?.[resolution]) || getLabelForResolution(item, resolution)
     const individualLabel = getLabelForResolution(item, resolution)
 
     const point: SelectedFeature = {
diff --git a/src/lib/generate-clusters.ts b/src/lib/generate-clusters.ts
index 0ade1444..2636ef52 100644
--- a/src/lib/generate-clusters.ts
+++ b/src/lib/generate-clusters.ts
@@ -72,11 +72,9 @@ export function generateClusters(items: Item[]): ClusteredMarkers {
     if (isInvalid) return it
 
     const h3Cache: Record<number, string> = {}
-    h3Cache[BASE_H3_RESOLUTION] = getH3Index(lat, lng, BASE_H3_RESOLUTION)
-    for (const h3Res of Object.values(RESOLUTION_TO_H3)) {
-      if (!h3Cache[h3Res]) {
-        h3Cache[h3Res] = getH3Index(lat, lng, h3Res)
-      }
+    const uniqueResolutions = new Set(Object.values(RESOLUTION_TO_H3))
+    for (const h3Res of uniqueResolutions) {
+      h3Cache[h3Res] = getH3Index(lat, lng, h3Res)
     }
     return { ...it, h3Cache }
   })

From 77a457ebfb10c3b71385ac598e396a7dfadf15f7 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 13 Jan 2026 18:10:01 -0800
Subject: [PATCH 09/33] inprogress

---
 .../AdminAlbum/AdminAlbumClient.tsx           |   2 +-
 src/components/AdminAlbum/Fields.tsx          | 201 ++++++++++++++++--
 2 files changed, 189 insertions(+), 14 deletions(-)

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index bff2b4d1..21c0988f 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -38,7 +38,7 @@ export default function AdminAlbumClient(
 
   return (
     <form>
-        {item && <Fields albumEntity={data?.album} item={item}>
+        {item && <Fields xmlAlbum={data?.album} gallery={gallery} item={item}>
           <Photo item={item} />
         </Fields>}
         <Stack
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 374b0433..99c1ad96 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -1,32 +1,207 @@
+import Button from '@mui/joy/Button'
 import Input from '@mui/joy/Input'
+import Option from '@mui/joy/Option'
+import Select from '@mui/joy/Select'
 import Stack from '@mui/joy/Stack'
+import Textarea from '@mui/joy/Textarea'
+import { useEffect, useState } from 'react'
+import useSWR from 'swr'
+import xml2js from 'xml2js'
 
-import { type AlbumResponseBody } from '../../lib/album'
+import type { Album, Gallery, IndexedKeywords, Item, ItemReferenceSource, XmlAlbum, XmlItem } from '../../types/common'
+import ComboBox from '../ComboBox'
 import { type ItemState } from './AdminAlbumClient'
-import Xml from './Xml'
+
+const fetcher = (url: string) => fetch(url).then(r => r.json())
+
+const REFERENCE_SOURCES: ItemReferenceSource[] = ['facebook', 'google', 'instagram', 'wikipedia', 'youtube']
 
 export default function Fields(
-  { albumEntity, item, children }:
-  { albumEntity: AlbumResponseBody['album'] | undefined, item: ItemState, children: React.ReactElement },
+  { xmlAlbum, gallery, item, children }:
+  { xmlAlbum: Album['album'] | undefined, gallery: Gallery, item: ItemState, children: React.ReactElement },
 ) {
+  const [editedItem, setEditedItem] = useState<Item | null>(item)
+  const [xmlOutput, setXmlOutput] = useState<string>('')
+  const [autocompleteValue, setAutocompleteValue] = useState<string>('')
+
+  // Fetch all available keywords from all albums
+  const { data: keywordsData } = useSWR<{ keywords: IndexedKeywords[] }>('/api/admin/keywords', fetcher)
+  const allKeywords = keywordsData?.keywords ?? []
+
+  useEffect(() => {
+    setEditedItem(item)
+    setXmlOutput('')
+    setAutocompleteValue('')
+  }, [item])
+
+  const generateXml = () => {
+    if (!editedItem || !xmlAlbum) return
+
+    // TODO: Implement XML generation for Album type
+    // The Album type is the transformed type, not the raw XML type
+    // Need to convert back to XmlAlbum structure
+    console.warn('XML generation not yet implemented for Album type')
+    setXmlOutput('<!-- XML generation temporarily disabled -->')
+  }
+
+  const filename = editedItem?.filename ? (Array.isArray(editedItem.filename) ? editedItem.filename[0] : editedItem.filename) : ''
+
   return (
     <>
       <Stack
         direction="row"
         spacing={2}
         sx={{
-          alignItems: 'center',
+          alignItems: 'flex-start',
         }}
       >
         {children}
-        <Stack direction="column">
-          <Input value={item?.filename} />
-          <Input value={item?.city} />
-          <Input value={item?.location ?? ''} />
-          <Input value={item?.caption} />
-          <Input value={item?.description ?? ''} />
-          <Input value={item?.search ?? ''} />
-          <Xml jsonBlob={JSON.stringify(albumEntity)} />
+        <Stack direction="column" spacing={2} sx={{ width: '35rem', flexShrink: 0 }}>
+          <Input
+            value={filename}
+            readOnly
+            placeholder="Filename"
+            title="Filename (read-only)"
+          />
+          <Input
+            value={editedItem?.city ?? ''}
+            onChange={(e) => setEditedItem((prev: Item | null) => prev ? { ...prev, city: e.target.value } : null)}
+            placeholder="City"
+            title="City (city)"
+          />
+          <Input
+            value={editedItem?.location ?? ''}
+            onChange={(e) => setEditedItem((prev: Item | null) => prev ? { ...prev, location: e.target.value } : null)}
+            placeholder="Location"
+            title="Location (location)"
+          />
+          <Input
+            value={editedItem?.caption ?? ''}
+            onChange={(e) => setEditedItem((prev: Item | null) => prev ? { ...prev, caption: e.target.value } : null)}
+            placeholder="Caption"
+            title="Caption (caption)"
+          />
+          <Textarea
+            value={editedItem?.description ?? ''}
+            onChange={(e) => setEditedItem((prev: Item | null) => prev ? { ...prev, description: e.target.value } : null)}
+            placeholder="Description"
+            title="Description (description)"
+            minRows={2}
+          />
+          <Input
+            value={editedItem?.search ?? ''}
+            onChange={(e) => setEditedItem(prev => prev ? { ...prev, search: e.target.value } : null)}
+            placeholder="Search keywords"
+            title="Search keywords (comma-separated)"
+          />
+          <ComboBox
+            className="keyword-autocomplete"
+            options={allKeywords}
+            value={null}
+            inputValue={autocompleteValue}
+            onInputChange={(newValue) => {
+              setAutocompleteValue(newValue)
+            }}
+            onChange={({ value }) => {
+              // Append the selected keyword to the existing search field
+              setEditedItem((prev: Item | null) => {
+                if (!prev) return null
+                const currentSearch = prev.search ?? ''
+                const separator = currentSearch && !currentSearch.endsWith(', ') ? ', ' : ''
+                return { ...prev, search: currentSearch + separator + value }
+              })
+              // Clear the autocomplete input
+              setAutocompleteValue('')
+            }}
+          />
+          <Stack direction="row" spacing={1}>
+            <Input
+              value={editedItem?.coordinates?.[1] ?? ''}
+              onChange={(e) => {
+                const lat = parseFloat(e.target.value) || 0
+                setEditedItem((prev: Item | null) => prev ? {
+                  ...prev,
+                  coordinates: [prev.coordinates?.[0] ?? 0, lat],
+                } : null)
+              }}
+              placeholder="Latitude"
+              title="Latitude (coordinates[1])"
+              type="number"
+              sx={{ flex: 1, minWidth: 0 }}
+            />
+            <Input
+              value={editedItem?.coordinates?.[0] ?? ''}
+              onChange={(e) => {
+                const lon = parseFloat(e.target.value) || 0
+                setEditedItem((prev: Item | null) => prev ? {
+                  ...prev,
+                  coordinates: [lon, prev.coordinates?.[1] ?? 0],
+                } : null)
+              }}
+              placeholder="Longitude"
+              title="Longitude (coordinates[0])"
+              type="number"
+              sx={{ flex: 1, minWidth: 0 }}
+            />
+            <Input
+              value={editedItem?.coordinateAccuracy ?? ''}
+              onChange={(e) => {
+                const accuracy = parseFloat(e.target.value) || null
+                setEditedItem((prev: Item | null) => prev ? {
+                  ...prev,
+                  coordinateAccuracy: accuracy,
+                } : null)
+              }}
+              placeholder="Accuracy"
+              title="Coordinate accuracy (geo.accuracy)"
+              type="number"
+              sx={{ flex: 0.6, minWidth: 0 }}
+            />
+          </Stack>
+          <Stack direction="row" spacing={2}>
+            <Select
+              value={editedItem?.reference?.[0] ?? ''}
+              onChange={(_, value) => {
+                setEditedItem((prev: Item | null) => prev ? {
+                  ...prev,
+                  reference: value ? [value as ItemReferenceSource, prev.reference?.[1] || ''] : null,
+                } : null)
+              }}
+              placeholder="Reference Source"
+              title="Reference source (reference[0])"
+              sx={{ flex: 1, minWidth: 0 }}
+            >
+              <Option value="">None</Option>
+              {REFERENCE_SOURCES.map(source => (
+                <Option key={source} value={source}>{source.charAt(0).toUpperCase() + source.slice(1)}</Option>
+              ))}
+            </Select>
+            <Input
+              value={editedItem?.reference?.[1] ?? ''}
+              onChange={(e) => {
+                const name = e.target.value
+                setEditedItem((prev: Item | null) => prev ? {
+                  ...prev,
+                  reference: prev.reference?.[0] ? [prev.reference[0], name] : null,
+                } : null)
+              }}
+              placeholder="Reference Name"
+              title="Reference name/ID (ref.name)"
+              sx={{ flex: 1, minWidth: 0 }}
+            />
+          </Stack>
+          <Button onClick={generateXml} variant="solid" color="primary">
+            Generate XML
+          </Button>
+          {xmlOutput && (
+            <Textarea
+              value={xmlOutput}
+              readOnly
+              minRows={10}
+              maxRows={20}
+              placeholder="Generated XML will appear here"
+            />
+          )}
         </Stack>
       </Stack>
     </>

From 5a3ef6cffc8824712f30c10f1871dca29fbc1e8e Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 13 Jan 2026 18:09:18 -0800
Subject: [PATCH 10/33] chore(Slippy Map): Optimize with less iteration

---
 src/components/SlippyMap/options.ts | 2 +-
 src/lib/generate-clusters.ts        | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/SlippyMap/options.ts b/src/components/SlippyMap/options.ts
index 813449eb..4b897879 100644
--- a/src/components/SlippyMap/options.ts
+++ b/src/components/SlippyMap/options.ts
@@ -76,7 +76,7 @@ export function transformSourceOptions(
     const { latitude: selectedLatitude, longitude: selectedLongitude } = validatePoint(selected.coordinates)
 
     const baseKey = getCachedH3Index(item)
-    const commonLabel = baseKey && computed.labels[baseKey]?.[resolution] || getLabelForResolution(item, resolution)
+    const commonLabel = (baseKey && computed.labels[baseKey]?.[resolution]) || getLabelForResolution(item, resolution)
     const individualLabel = getLabelForResolution(item, resolution)
 
     const point: SelectedFeature = {
diff --git a/src/lib/generate-clusters.ts b/src/lib/generate-clusters.ts
index 0ade1444..2636ef52 100644
--- a/src/lib/generate-clusters.ts
+++ b/src/lib/generate-clusters.ts
@@ -72,11 +72,9 @@ export function generateClusters(items: Item[]): ClusteredMarkers {
     if (isInvalid) return it
 
     const h3Cache: Record<number, string> = {}
-    h3Cache[BASE_H3_RESOLUTION] = getH3Index(lat, lng, BASE_H3_RESOLUTION)
-    for (const h3Res of Object.values(RESOLUTION_TO_H3)) {
-      if (!h3Cache[h3Res]) {
-        h3Cache[h3Res] = getH3Index(lat, lng, h3Res)
-      }
+    const uniqueResolutions = new Set(Object.values(RESOLUTION_TO_H3))
+    for (const h3Res of uniqueResolutions) {
+      h3Cache[h3Res] = getH3Index(lat, lng, h3Res)
     }
     return { ...it, h3Cache }
   })

From 9512ceec2129b725f8e8ba2b1ac5a73fb5b397c2 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 13 Jan 2026 19:31:31 -0800
Subject: [PATCH 11/33] feat(Admin > Edit Album): Persist album data

---
 .../AdminAlbum/AdminAlbumClient.tsx           | 25 ++++++-
 src/components/AdminAlbum/Fields.tsx          | 73 ++++++++++++-------
 2 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index 6c9b0815..9505c435 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -31,6 +31,8 @@ export default function AdminAlbumClient(
   const [searchQuery, setSearchQuery] = useState<string>('')
   const [searchResults, setSearchResults] = useState<SearchResult[]>([])
   const [isSearching, setIsSearching] = useState(false)
+  // Store edits for all items by ID - persist across photo switches
+  const [editedItems, setEditedItems] = useState<Record<string, RawXmlItem>>({})
   const { data, error, mutate } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${currentGallery}/${album?.name}` : null, fetcher)
 
   const items = data?.album.item ? (Array.isArray(data.album.item) ? data.album.item : [data.album.item]) : []
@@ -81,6 +83,8 @@ export default function AdminAlbumClient(
     const selectedAlbum = galleryAlbum[currentGallery].albums.find(a => a.name === newValue)
     if (selectedAlbum) {
       setAlbum(selectedAlbum)
+      // Clear edits when album changes
+      setEditedItems({})
       setCurrentIndex(-1)
       setItem(null)
     }
@@ -93,6 +97,8 @@ export default function AdminAlbumClient(
     if (newValue) {
       setCurrentGallery(newValue as Gallery)
       setAlbum(null)
+      // Clear edits when gallery changes
+      setEditedItems({})
       setItem(null)
       setCurrentIndex(-1)
     }
@@ -146,9 +152,26 @@ export default function AdminAlbumClient(
     }
   }, [currentIndex, items])
 
+  const handleItemUpdate = (updatedItem: RawXmlItem) => {
+    setEditedItems(prev => ({
+      ...prev,
+      [updatedItem.$.id]: updatedItem,
+    }))
+  }
+
+  // Get item with edits applied if they exist
+  const getItemWithEdits = (itemToGet: RawXmlItem | null): RawXmlItem | null => {
+    if (!itemToGet) return null
+    return editedItems[itemToGet.$.id] || itemToGet
+  }
+
   return (
     <form>
-        {item && <Fields xmlAlbum={data} gallery={currentGallery} item={item}>
+        {item && <Fields
+          xmlAlbum={data}
+          gallery={currentGallery}
+          item={getItemWithEdits(item)}
+          onItemUpdate={handleItemUpdate}          editedItems={editedItems}        >
           <Photo item={item} gallery={currentGallery} />
         </Fields>}
         <Stack
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 9c965427..95eff588 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -4,7 +4,7 @@ import Option from '@mui/joy/Option'
 import Select from '@mui/joy/Select'
 import Stack from '@mui/joy/Stack'
 import Textarea from '@mui/joy/Textarea'
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import useSWR from 'swr'
 import xml2js from 'xml2js'
 
@@ -17,12 +17,20 @@ const fetcher = (url: string) => fetch(url).then(r => r.json())
 const REFERENCE_SOURCES: ItemReferenceSource[] = ['facebook', 'google', 'instagram', 'wikipedia', 'youtube']
 
 export default function Fields(
-  { xmlAlbum, gallery, item, children }:
-  { xmlAlbum: RawXmlAlbum | undefined, gallery: Gallery, item: XmlItemState, children: React.ReactElement },
+  { xmlAlbum, gallery, item, children, onItemUpdate, editedItems }:
+  {
+    xmlAlbum: RawXmlAlbum | undefined,
+    gallery: Gallery,
+    item: XmlItemState,
+    children: React.ReactElement,
+    onItemUpdate: (item: RawXmlItem) => void,
+    editedItems: Record<string, RawXmlItem>
+  },
 ) {
   const [editedItem, setEditedItem] = useState<RawXmlItem | null>(item)
   const [xmlOutput, setXmlOutput] = useState<string>('')
   const [autocompleteValue, setAutocompleteValue] = useState<string>('')
+  const updatePendingRef = useRef(false)
 
   // Fetch all available keywords from all albums
   const { data: keywordsData } = useSWR<{ keywords: IndexedKeywords[] }>('/api/admin/keywords', fetcher)
@@ -34,30 +42,45 @@ export default function Fields(
     setAutocompleteValue('')
   }, [item])
 
+  // Notify parent after editedItem updates (after render)
+  useEffect(() => {
+    if (updatePendingRef.current && editedItem) {
+      updatePendingRef.current = false
+      onItemUpdate(editedItem)
+    }
+  }, [editedItem, onItemUpdate])
+
+  // Wrapper to update local state and schedule parent notification
+  const updateItem = (updater: (prev: RawXmlItem | null) => RawXmlItem | null) => {
+    updatePendingRef.current = true
+    setEditedItem(updater)
+  }
+
   const generateXml = () => {
-    if (!editedItem || !xmlAlbum) return
+    if (!xmlAlbum) return
 
     // Get all items from XML
     const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
 
-    // Update the edited item in the list with proper field ordering
-    const itemIndex = items.findIndex((i: RawXmlItem | undefined) => i?.$.id === editedItem.$.id)
-    if (itemIndex !== -1) {
+    // Apply all edits from editedItems state and maintain proper field ordering
+    const updatedItems = items.map((originalItem: RawXmlItem) => {
+      const edited = editedItems[originalItem.$.id]
+      if (!edited) return originalItem
+
       // Reconstruct item with desired field order: search before geo
-      const { search, geo, ref, ...rest } = editedItem
-      const orderedItem: RawXmlItem = {
+      const { search, geo, ref, ...rest } = edited
+      return {
         ...rest,
         ...(search !== undefined && search !== null && { search }),
         ...(geo && { geo }),
         ...(ref && { ref }),
       }
-      items[itemIndex] = orderedItem
-    }
+    })
 
     // Build XML album structure
-    const xmlOutput = {
+    const albumXml = {
       meta: xmlAlbum.album.meta,
-      item: items.length === 1 ? items[0] : items,
+      item: updatedItems.length === 1 ? updatedItems[0] : updatedItems,
     }
 
     // Convert to XML
@@ -67,7 +90,7 @@ export default function Fields(
       xmldec: { version: '1.0', encoding: 'UTF-8' },
     })
 
-    const xml = builder.buildObject(xmlOutput)
+    const xml = builder.buildObject(albumXml)
     setXmlOutput(xml)
   }
 
@@ -92,32 +115,32 @@ export default function Fields(
           />
           <Input
             value={editedItem?.photo_city ?? ''}
-            onChange={(e) => setEditedItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_city: e.target.value } : null)}
+            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_city: e.target.value } : null)}
             placeholder="City"
             title="City (photo_city)"
           />
           <Input
             value={editedItem?.photo_loc ?? ''}
-            onChange={(e) => setEditedItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_loc: e.target.value } : null)}
+            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_loc: e.target.value } : null)}
             placeholder="Location"
             title="Location (photo_loc)"
           />
           <Input
             value={editedItem?.thumb_caption ?? ''}
-            onChange={(e) => setEditedItem((prev: RawXmlItem | null) => prev ? { ...prev, thumb_caption: e.target.value } : null)}
+            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, thumb_caption: e.target.value } : null)}
             placeholder="Caption"
             title="Caption (thumb_caption)"
           />
           <Textarea
             value={editedItem?.photo_desc ?? ''}
-            onChange={(e) => setEditedItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_desc: e.target.value } : null)}
+            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_desc: e.target.value } : null)}
             placeholder="Description"
             title="Description (photo_desc)"
             minRows={2}
           />
           <Input
             value={editedItem?.search ?? ''}
-            onChange={(e) => setEditedItem((prev: RawXmlItem | null) => prev ? { ...prev, search: e.target.value } : null)}
+            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, search: e.target.value } : null)}
             placeholder="Search keywords"
             title="Search keywords (comma-separated)"
           />
@@ -131,7 +154,7 @@ export default function Fields(
             }}
             onChange={({ value }) => {
               // Append the selected keyword to the existing search field
-              setEditedItem((prev: RawXmlItem | null) => {
+              updateItem((prev: RawXmlItem | null) => {
                 if (!prev) return null
                 const currentSearch = prev.search ?? ''
                 const separator = currentSearch && !currentSearch.endsWith(', ') ? ', ' : ''
@@ -146,7 +169,7 @@ export default function Fields(
               value={editedItem?.geo?.lat ?? ''}
               onChange={(e) => {
                 const lat = e.target.value
-                setEditedItem((prev: RawXmlItem | null) => prev ? {
+                updateItem((prev: RawXmlItem | null) => prev ? {
                   ...prev,
                   geo: lat || prev.geo?.lon ? { lat, lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' } : undefined,
                 } : null)
@@ -160,7 +183,7 @@ export default function Fields(
               value={editedItem?.geo?.lon ?? ''}
               onChange={(e) => {
                 const lon = e.target.value
-                setEditedItem((prev: RawXmlItem | null) => prev ? {
+                updateItem((prev: RawXmlItem | null) => prev ? {
                   ...prev,
                   geo: lon || prev.geo?.lat ? { lat: prev.geo?.lat || '', lon, accuracy: prev.geo?.accuracy || '' } : undefined,
                 } : null)
@@ -174,7 +197,7 @@ export default function Fields(
               value={editedItem?.geo?.accuracy ?? ''}
               onChange={(e) => {
                 const accuracy = e.target.value
-                setEditedItem((prev: RawXmlItem | null) => prev ? {
+                updateItem((prev: RawXmlItem | null) => prev ? {
                   ...prev,
                   geo: prev.geo ? { ...prev.geo, accuracy } : undefined,
                 } : null)
@@ -189,7 +212,7 @@ export default function Fields(
             <Select
               value={editedItem?.ref?.source ?? ''}
               onChange={(_, value) => {
-                setEditedItem((prev: RawXmlItem | null) => prev ? {
+                updateItem((prev: RawXmlItem | null) => prev ? {
                   ...prev,
                   ref: value ? { source: value as ItemReferenceSource, name: prev.ref?.name || '' } : undefined,
                 } : null)
@@ -207,7 +230,7 @@ export default function Fields(
               value={editedItem?.ref?.name ?? ''}
               onChange={(e) => {
                 const name = e.target.value
-                setEditedItem((prev: RawXmlItem | null) => prev ? {
+                updateItem((prev: RawXmlItem | null) => prev ? {
                   ...prev,
                   ref: prev.ref?.source ? { source: prev.ref.source, name } : undefined,
                 } : null)

From 1ca56d2dd254e430d517d725f004bf22de2b38d1 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 13 Jan 2026 19:57:57 -0800
Subject: [PATCH 12/33] feat(Admin > Edit Album): Discard empty XML elements

---
 src/components/AdminAlbum/Fields.tsx | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 95eff588..08b0a6d8 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -62,6 +62,22 @@ export default function Fields(
     // Get all items from XML
     const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
 
+    // Helper to remove empty/null/undefined properties recursively
+    const removeEmpty = (obj: any): any => {
+      if (obj === null || obj === undefined || obj === '') return undefined
+      if (typeof obj !== 'object') return obj
+      if (Array.isArray(obj)) return obj.map(removeEmpty).filter((v) => v !== undefined)
+
+      const cleaned: any = {}
+      for (const [key, value] of Object.entries(obj)) {
+        const cleanedValue = removeEmpty(value)
+        if (cleanedValue !== undefined) {
+          cleaned[key] = cleanedValue
+        }
+      }
+      return Object.keys(cleaned).length > 0 ? cleaned : undefined
+    }
+
     // Apply all edits from editedItems state and maintain proper field ordering
     const updatedItems = items.map((originalItem: RawXmlItem) => {
       const edited = editedItems[originalItem.$.id]
@@ -69,13 +85,16 @@ export default function Fields(
 
       // Reconstruct item with desired field order: search before geo
       const { search, geo, ref, ...rest } = edited
-      return {
+      const orderedItem = {
         ...rest,
-        ...(search !== undefined && search !== null && { search }),
+        ...(search !== undefined && search !== null && search !== '' && { search }),
         ...(geo && { geo }),
         ...(ref && { ref }),
       }
-    })
+      
+      // Remove empty properties
+      return removeEmpty(orderedItem)
+    }).filter((item) => item !== undefined)
 
     // Build XML album structure
     const albumXml = {

From b30d18902ceee972e5089b8a676774b3494ab9cf Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 13 Jan 2026 20:14:23 -0800
Subject: [PATCH 13/33] feat(Admin > Edit Album): Input lat,long spilt,
 clipboard, allow degrees minutes format

---
 src/components/AdminAlbum/Fields.tsx | 120 ++++++++++++++++++++++++---
 1 file changed, 107 insertions(+), 13 deletions(-)

diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 08b0a6d8..1d643e2b 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -1,4 +1,5 @@
 import Button from '@mui/joy/Button'
+import IconButton from '@mui/joy/IconButton'
 import Input from '@mui/joy/Input'
 import Option from '@mui/joy/Option'
 import Select from '@mui/joy/Select'
@@ -16,6 +17,29 @@ const fetcher = (url: string) => fetch(url).then(r => r.json())
 
 const REFERENCE_SOURCES: ItemReferenceSource[] = ['facebook', 'google', 'instagram', 'wikipedia', 'youtube']
 
+// Parse DMS (Degrees Minutes Seconds) format to decimal
+// Supports formats like: 50° 22' 51.51" N or 50°22'51.51"N or 50 22 51.51 N
+function parseDMS(dms: string): number | null {
+  const dmsPattern = /(\d+)[°\s]+(\d+)['\s]+(\d+(?:\.\d+)?)["\s]*([NSEW])?/i
+  const match = dms.trim().match(dmsPattern)
+
+  if (!match) return null
+
+  const degrees = parseFloat(match[1])
+  const minutes = parseFloat(match[2])
+  const seconds = parseFloat(match[3])
+  const direction = match[4]?.toUpperCase()
+
+  let decimal = degrees + minutes / 60 + seconds / 3600
+
+  // Negate if South or West
+  if (direction === 'S' || direction === 'W') {
+    decimal = -decimal
+  }
+
+  return decimal
+}
+
 export default function Fields(
   { xmlAlbum, gallery, item, children, onItemUpdate, editedItems }:
   {
@@ -91,7 +115,7 @@ export default function Fields(
         ...(geo && { geo }),
         ...(ref && { ref }),
       }
-      
+
       // Remove empty properties
       return removeEmpty(orderedItem)
     }).filter((item) => item !== undefined)
@@ -187,31 +211,101 @@ export default function Fields(
             <Input
               value={editedItem?.geo?.lat ?? ''}
               onChange={(e) => {
-                const lat = e.target.value
-                updateItem((prev: RawXmlItem | null) => prev ? {
-                  ...prev,
-                  geo: lat || prev.geo?.lon ? { lat, lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' } : undefined,
-                } : null)
+                const value = e.target.value
+
+                // Check if value contains DMS format (degrees, minutes, seconds)
+                if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
+                  // Split by comma to check for lat,lon DMS pair
+                  const parts = value.split(',').map(s => s.trim())
+
+                  if (parts.length === 2) {
+                    // Parse both lat and lon as DMS
+                    const lat = parseDMS(parts[0])
+                    const lon = parseDMS(parts[1])
+                    if (lat !== null && lon !== null) {
+                      updateItem((prev: RawXmlItem | null) => prev ? {
+                        ...prev,
+                        geo: { lat: lat.toString(), lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
+                      } : null)
+                      return
+                    }
+                  } else {
+                    // Single DMS value for latitude only
+                    const lat = parseDMS(value)
+                    if (lat !== null) {
+                      updateItem((prev: RawXmlItem | null) => prev ? {
+                        ...prev,
+                        geo: { lat: lat.toString(), lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' },
+                      } : null)
+                      return
+                    }
+                  }
+                }
+
+                // Check if the value contains a comma (decimal lat,lon format)
+                if (value.includes(',')) {
+                  const [lat, lon] = value.split(',').map(s => s.trim())
+                  updateItem((prev: RawXmlItem | null) => prev ? {
+                    ...prev,
+                    geo: { lat: lat || '', lon: lon || '', accuracy: prev.geo?.accuracy || '' },
+                  } : null)
+                } else {
+                  // Plain value for latitude
+                  const lat = value
+                  updateItem((prev: RawXmlItem | null) => prev ? {
+                    ...prev,
+                    geo: lat || prev.geo?.lon ? { lat, lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' } : undefined,
+                  } : null)
+                }
               }}
-              placeholder="Latitude"
-              title="Latitude (geo.lat)"
-              type="number"
+              placeholder="Latitude (or lat,lon or DMS)"
+              title="Latitude (geo.lat) - paste lat,lon or DMS format to auto-split"
               sx={{ flex: 1, minWidth: 0 }}
             />
             <Input
               value={editedItem?.geo?.lon ?? ''}
               onChange={(e) => {
-                const lon = e.target.value
+                const value = e.target.value
+
+                // Check if value contains DMS format
+                if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
+                  const lon = parseDMS(value)
+                  if (lon !== null) {
+                    updateItem((prev: RawXmlItem | null) => prev ? {
+                      ...prev,
+                      geo: { lat: prev.geo?.lat || '', lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
+                    } : null)
+                    return
+                  }
+                }
+
+                // Plain value for longitude
+                const lon = value
                 updateItem((prev: RawXmlItem | null) => prev ? {
                   ...prev,
                   geo: lon || prev.geo?.lat ? { lat: prev.geo?.lat || '', lon, accuracy: prev.geo?.accuracy || '' } : undefined,
                 } : null)
               }}
-              placeholder="Longitude"
-              title="Longitude (geo.lon)"
-              type="number"
+              placeholder="Longitude (or DMS)"
+              title="Longitude (geo.lon) - paste DMS format to convert"
               sx={{ flex: 1, minWidth: 0 }}
             />
+            <IconButton
+              size="sm"
+              variant="outlined"
+              onClick={() => {
+                const lat = editedItem?.geo?.lat ?? ''
+                const lon = editedItem?.geo?.lon ?? ''
+                if (lat && lon) {
+                  navigator.clipboard.writeText(`${lat},${lon}`)
+                }
+              }}
+              disabled={!editedItem?.geo?.lat || !editedItem?.geo?.lon}
+              title="Copy lat,lon to clipboard"
+              sx={{ minWidth: 'auto', px: 1 }}
+            >
+              📋
+            </IconButton>
             <Input
               value={editedItem?.geo?.accuracy ?? ''}
               onChange={(e) => {

From 104c0d77b6d34bf95423f964be09eb7d3b5194f6 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 13 Jan 2026 21:11:36 -0800
Subject: [PATCH 14/33] feat(Admin > Edit Album): Clipboard for reference

---
 package-lock.json                    | 711 +++++++++++++++------------
 package.json                         |   6 +-
 src/components/AdminAlbum/Fields.tsx |  16 +
 src/models/__tests__/album.test.ts   |   9 +-
 src/models/album.ts                  |  34 +-
 src/utils/reference.ts               |  25 +
 6 files changed, 447 insertions(+), 354 deletions(-)
 create mode 100644 src/utils/reference.ts

diff --git a/package-lock.json b/package-lock.json
index 8e520460..475c653c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
         "stylis": "^4.3.6",
         "swr": "^2.3.8",
         "xml2js": "^0.6.2",
-        "zod": "^4.3.4"
+        "zod": "^4.3.5"
       },
       "devDependencies": {
         "@eslint/js": "^9.28.0",
@@ -43,7 +43,7 @@
         "@types/heic-convert": "^2.1.0",
         "@types/jest": "^30.0.0",
         "@types/mime-types": "^3.0.1",
-        "@types/node": "^24.10.4",
+        "@types/node": "^24.10.8",
         "@types/react": "19.2.7",
         "@types/react-dom": "19.2.3",
         "@types/react-image-gallery": "^1.2.4",
@@ -54,7 +54,7 @@
         "eslint-config-next": "16.1.1",
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-jest-dom": "^5.5.0",
-        "eslint-plugin-jsdoc": "^61.5.0",
+        "eslint-plugin-jsdoc": "^61.7.1",
         "eslint-plugin-jsx-a11y": "^6.10.2",
         "eslint-plugin-testing-library": "^7.15.4",
         "jest": "^30.2.0",
@@ -104,12 +104,12 @@
       "license": "ISC"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz",
+      "integrity": "sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -118,9 +118,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
-      "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.6.tgz",
+      "integrity": "sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -128,21 +128,21 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
-      "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz",
+      "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-module-transforms": "^7.28.3",
-        "@babel/helpers": "^7.28.4",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.28.5",
-        "@babel/types": "^7.28.5",
+        "@babel/code-frame": "^7.28.6",
+        "@babel/generator": "^7.28.6",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helpers": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -176,13 +176,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
-      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.6.tgz",
+      "integrity": "sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.5",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -192,13 +192,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.2",
+        "@babel/compat-data": "^7.28.6",
         "@babel/helper-validator-option": "^7.27.1",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
@@ -228,28 +228,28 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
-      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
+      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.28.3"
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -259,9 +259,9 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
-      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
+      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -297,26 +297,26 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
-      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz",
+      "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.4"
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
-      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz",
+      "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.5"
+        "@babel/types": "^7.28.6"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -381,13 +381,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
-      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz",
+      "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -423,13 +423,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz",
-      "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz",
+      "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -549,13 +549,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
-      "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.28.6.tgz",
+      "integrity": "sha512-+nDNmQye7nlnuuHDboPbGm00Vqg3oO8niRRL27/4LYHUsHYh0zJ1xWOz0uRwNFmM1Avzk8wZbc6rdiYhomzv/A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -565,40 +565,40 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
-      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
+      "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+        "@babel/code-frame": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
-      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.6.tgz",
+      "integrity": "sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.5",
+        "@babel/code-frame": "^7.28.6",
+        "@babel/generator": "^7.28.6",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.5",
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.5",
+        "@babel/parser": "^7.28.6",
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.28.6",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -606,9 +606,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
-      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.6.tgz",
+      "integrity": "sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -741,9 +741,9 @@
       }
     },
     "node_modules/@emnapi/core": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.1.tgz",
-      "integrity": "sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
+      "integrity": "sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -761,9 +761,9 @@
       "optional": true
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz",
-      "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz",
+      "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -976,17 +976,17 @@
       "license": "0BSD"
     },
     "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.76.0",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.76.0.tgz",
-      "integrity": "sha512-g+RihtzFgGTx2WYCuTHbdOXJeAlGnROws0TeALx9ow/ZmOROOZkVg5wp/B44n0WJgI4SQFP1eWM2iRPlU2Y14w==",
+      "version": "0.78.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.78.0.tgz",
+      "integrity": "sha512-rQkU5u8hNAq2NVRzHnIUUvR6arbO0b6AOlvpTNS48CkiKSn/xtNfOzBK23JE4SiW89DgvU7GtxLVgV4Vn2HBAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.8",
-        "@typescript-eslint/types": "^8.46.0",
+        "@typescript-eslint/types": "^8.46.4",
         "comment-parser": "1.4.1",
         "esquery": "^1.6.0",
-        "jsdoc-type-pratt-parser": "~6.10.0"
+        "jsdoc-type-pratt-parser": "~7.0.0"
       },
       "engines": {
         "node": ">=20.11.0"
@@ -3531,9 +3531,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.54.0.tgz",
-      "integrity": "sha512-OywsdRHrFvCdvsewAInDKCNyR3laPA2mc9bRYJ6LBp5IyvF3fvXbbNR0bSzHlZVFtn6E0xw2oZlyjg4rKCVcng==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.55.1.tgz",
+      "integrity": "sha512-9R0DM/ykwfGIlNu6+2U09ga0WXeZ9MRC2Ter8jnz8415VbuIykVuc6bhdrbORFZANDmTDvq26mJrEVTl8TdnDg==",
       "cpu": [
         "arm"
       ],
@@ -3545,9 +3545,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.54.0.tgz",
-      "integrity": "sha512-Skx39Uv+u7H224Af+bDgNinitlmHyQX1K/atIA32JP3JQw6hVODX5tkbi2zof/E69M1qH2UoN3Xdxgs90mmNYw==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.55.1.tgz",
+      "integrity": "sha512-eFZCb1YUqhTysgW3sj/55du5cG57S7UTNtdMjCW7LwVcj3dTTcowCsC8p7uBdzKsZYa8J7IDE8lhMI+HX1vQvg==",
       "cpu": [
         "arm64"
       ],
@@ -3559,9 +3559,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.54.0.tgz",
-      "integrity": "sha512-k43D4qta/+6Fq+nCDhhv9yP2HdeKeP56QrUUTW7E6PhZP1US6NDqpJj4MY0jBHlJivVJD5P8NxrjuobZBJTCRw==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.55.1.tgz",
+      "integrity": "sha512-p3grE2PHcQm2e8PSGZdzIhCKbMCw/xi9XvMPErPhwO17vxtvCN5FEA2mSLgmKlCjHGMQTP6phuQTYWUnKewwGg==",
       "cpu": [
         "arm64"
       ],
@@ -3573,9 +3573,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.54.0.tgz",
-      "integrity": "sha512-cOo7biqwkpawslEfox5Vs8/qj83M/aZCSSNIWpVzfU2CYHa2G3P1UN5WF01RdTHSgCkri7XOlTdtk17BezlV3A==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.55.1.tgz",
+      "integrity": "sha512-rDUjG25C9qoTm+e02Esi+aqTKSBYwVTaoS1wxcN47/Luqef57Vgp96xNANwt5npq9GDxsH7kXxNkJVEsWEOEaQ==",
       "cpu": [
         "x64"
       ],
@@ -3587,9 +3587,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.54.0.tgz",
-      "integrity": "sha512-miSvuFkmvFbgJ1BevMa4CPCFt5MPGw094knM64W9I0giUIMMmRYcGW/JWZDriaw/k1kOBtsWh1z6nIFV1vPNtA==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.55.1.tgz",
+      "integrity": "sha512-+JiU7Jbp5cdxekIgdte0jfcu5oqw4GCKr6i3PJTlXTCU5H5Fvtkpbs4XJHRmWNXF+hKmn4v7ogI5OQPaupJgOg==",
       "cpu": [
         "arm64"
       ],
@@ -3601,9 +3601,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.54.0.tgz",
-      "integrity": "sha512-KGXIs55+b/ZfZsq9aR026tmr/+7tq6VG6MsnrvF4H8VhwflTIuYh+LFUlIsRdQSgrgmtM3fVATzEAj4hBQlaqQ==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.55.1.tgz",
+      "integrity": "sha512-V5xC1tOVWtLLmr3YUk2f6EJK4qksksOYiz/TCsFHu/R+woubcLWdC9nZQmwjOAbmExBIVKsm1/wKmEy4z4u4Bw==",
       "cpu": [
         "x64"
       ],
@@ -3615,9 +3615,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.54.0.tgz",
-      "integrity": "sha512-EHMUcDwhtdRGlXZsGSIuXSYwD5kOT9NVnx9sqzYiwAc91wfYOE1g1djOEDseZJKKqtHAHGwnGPQu3kytmfaXLQ==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.55.1.tgz",
+      "integrity": "sha512-Rn3n+FUk2J5VWx+ywrG/HGPTD9jXNbicRtTM11e/uorplArnXZYsVifnPPqNNP5BsO3roI4n8332ukpY/zN7rQ==",
       "cpu": [
         "arm"
       ],
@@ -3629,9 +3629,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.54.0.tgz",
-      "integrity": "sha512-+pBrqEjaakN2ySv5RVrj/qLytYhPKEUwk+e3SFU5jTLHIcAtqh2rLrd/OkbNuHJpsBgxsD8ccJt5ga/SeG0JmA==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.55.1.tgz",
+      "integrity": "sha512-grPNWydeKtc1aEdrJDWk4opD7nFtQbMmV7769hiAaYyUKCT1faPRm2av8CX1YJsZ4TLAZcg9gTR1KvEzoLjXkg==",
       "cpu": [
         "arm"
       ],
@@ -3643,9 +3643,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.54.0.tgz",
-      "integrity": "sha512-NSqc7rE9wuUaRBsBp5ckQ5CVz5aIRKCwsoa6WMF7G01sX3/qHUw/z4pv+D+ahL1EIKy6Enpcnz1RY8pf7bjwng==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.55.1.tgz",
+      "integrity": "sha512-a59mwd1k6x8tXKcUxSyISiquLwB5pX+fJW9TkWU46lCqD/GRDe9uDN31jrMmVP3feI3mhAdvcCClhV8V5MhJFQ==",
       "cpu": [
         "arm64"
       ],
@@ -3657,9 +3657,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.54.0.tgz",
-      "integrity": "sha512-gr5vDbg3Bakga5kbdpqx81m2n9IX8M6gIMlQQIXiLTNeQW6CucvuInJ91EuCJ/JYvc+rcLLsDFcfAD1K7fMofg==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.55.1.tgz",
+      "integrity": "sha512-puS1MEgWX5GsHSoiAsF0TYrpomdvkaXm0CofIMG5uVkP6IBV+ZO9xhC5YEN49nsgYo1DuuMquF9+7EDBVYu4uA==",
       "cpu": [
         "arm64"
       ],
@@ -3671,9 +3671,23 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.54.0.tgz",
-      "integrity": "sha512-gsrtB1NA3ZYj2vq0Rzkylo9ylCtW/PhpLEivlgWe0bpgtX5+9j9EZa0wtZiCjgu6zmSeZWyI/e2YRX1URozpIw==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.55.1.tgz",
+      "integrity": "sha512-r3Wv40in+lTsULSb6nnoudVbARdOwb2u5fpeoOAZjFLznp6tDU8kd+GTHmJoqZ9lt6/Sys33KdIHUaQihFcu7g==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.55.1.tgz",
+      "integrity": "sha512-MR8c0+UxAlB22Fq4R+aQSPBayvYa3+9DrwG/i1TKQXFYEaoW3B5b/rkSRIypcZDdWjWnpcvxbNaAJDcSbJU3Lw==",
       "cpu": [
         "loong64"
       ],
@@ -3685,9 +3699,23 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.54.0.tgz",
-      "integrity": "sha512-y3qNOfTBStmFNq+t4s7Tmc9hW2ENtPg8FeUD/VShI7rKxNW7O4fFeaYbMsd3tpFlIg1Q8IapFgy7Q9i2BqeBvA==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.55.1.tgz",
+      "integrity": "sha512-3KhoECe1BRlSYpMTeVrD4sh2Pw2xgt4jzNSZIIPLFEsnQn9gAnZagW9+VqDqAHgm1Xc77LzJOo2LdigS5qZ+gw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.55.1.tgz",
+      "integrity": "sha512-ziR1OuZx0vdYZZ30vueNZTg73alF59DicYrPViG0NEgDVN8/Jl87zkAPu4u6VjZST2llgEUjaiNl9JM6HH1Vdw==",
       "cpu": [
         "ppc64"
       ],
@@ -3699,9 +3727,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.54.0.tgz",
-      "integrity": "sha512-89sepv7h2lIVPsFma8iwmccN7Yjjtgz0Rj/Ou6fEqg3HDhpCa+Et+YSufy27i6b0Wav69Qv4WBNl3Rs6pwhebQ==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.55.1.tgz",
+      "integrity": "sha512-uW0Y12ih2XJRERZ4jAfKamTyIHVMPQnTZcQjme2HMVDAHY4amf5u414OqNYC+x+LzRdRcnIG1YodLrrtA8xsxw==",
       "cpu": [
         "riscv64"
       ],
@@ -3713,9 +3741,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.54.0.tgz",
-      "integrity": "sha512-ZcU77ieh0M2Q8Ur7D5X7KvK+UxbXeDHwiOt/CPSBTI1fBmeDMivW0dPkdqkT4rOgDjrDDBUed9x4EgraIKoR2A==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.55.1.tgz",
+      "integrity": "sha512-u9yZ0jUkOED1BFrqu3BwMQoixvGHGZ+JhJNkNKY/hyoEgOwlqKb62qu+7UjbPSHYjiVy8kKJHvXKv5coH4wDeg==",
       "cpu": [
         "riscv64"
       ],
@@ -3727,9 +3755,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.54.0.tgz",
-      "integrity": "sha512-2AdWy5RdDF5+4YfG/YesGDDtbyJlC9LHmL6rZw6FurBJ5n4vFGupsOBGfwMRjBYH7qRQowT8D/U4LoSvVwOhSQ==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.55.1.tgz",
+      "integrity": "sha512-/0PenBCmqM4ZUd0190j7J0UsQ/1nsi735iPRakO8iPciE7BQ495Y6msPzaOmvx0/pn+eJVVlZrNrSh4WSYLxNg==",
       "cpu": [
         "s390x"
       ],
@@ -3741,9 +3769,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.54.0.tgz",
-      "integrity": "sha512-WGt5J8Ij/rvyqpFexxk3ffKqqbLf9AqrTBbWDk7ApGUzaIs6V+s2s84kAxklFwmMF/vBNGrVdYgbblCOFFezMQ==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.55.1.tgz",
+      "integrity": "sha512-a8G4wiQxQG2BAvo+gU6XrReRRqj+pLS2NGXKm8io19goR+K8lw269eTrPkSdDTALwMmJp4th2Uh0D8J9bEV1vg==",
       "cpu": [
         "x64"
       ],
@@ -3755,9 +3783,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.54.0.tgz",
-      "integrity": "sha512-JzQmb38ATzHjxlPHuTH6tE7ojnMKM2kYNzt44LO/jJi8BpceEC8QuXYA908n8r3CNuG/B3BV8VR3Hi1rYtmPiw==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.55.1.tgz",
+      "integrity": "sha512-bD+zjpFrMpP/hqkfEcnjXWHMw5BIghGisOKPj+2NaNDuVT+8Ds4mPf3XcPHuat1tz89WRL+1wbcxKY3WSbiT7w==",
       "cpu": [
         "x64"
       ],
@@ -3768,10 +3796,24 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.55.1.tgz",
+      "integrity": "sha512-eLXw0dOiqE4QmvikfQ6yjgkg/xDM+MdU9YJuP4ySTibXU0oAvnEWXt7UDJmD4UkYialMfOGFPJnIHSe/kdzPxg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.54.0.tgz",
-      "integrity": "sha512-huT3fd0iC7jigGh7n3q/+lfPcXxBi+om/Rs3yiFxjvSxbSB6aohDFXbWvlspaqjeOh+hx7DDHS+5Es5qRkWkZg==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.55.1.tgz",
+      "integrity": "sha512-xzm44KgEP11te3S2HCSyYf5zIzWmx3n8HDCc7EE59+lTcswEWNpvMLfd9uJvVX8LCg9QWG67Xt75AuHn4vgsXw==",
       "cpu": [
         "arm64"
       ],
@@ -3783,9 +3825,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.54.0.tgz",
-      "integrity": "sha512-c2V0W1bsKIKfbLMBu/WGBz6Yci8nJ/ZJdheE0EwB73N3MvHYKiKGs3mVilX4Gs70eGeDaMqEob25Tw2Gb9Nqyw==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.55.1.tgz",
+      "integrity": "sha512-yR6Bl3tMC/gBok5cz/Qi0xYnVbIxGx5Fcf/ca0eB6/6JwOY+SRUcJfI0OpeTpPls7f194as62thCt/2BjxYN8g==",
       "cpu": [
         "arm64"
       ],
@@ -3797,9 +3839,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.54.0.tgz",
-      "integrity": "sha512-woEHgqQqDCkAzrDhvDipnSirm5vxUXtSKDYTVpZG3nUdW/VVB5VdCYA2iReSj/u3yCZzXID4kuKG7OynPnB3WQ==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.55.1.tgz",
+      "integrity": "sha512-3fZBidchE0eY0oFZBnekYCfg+5wAB0mbpCBuofh5mZuzIU/4jIVkbESmd2dOsFNS78b53CYv3OAtwqkZZmU5nA==",
       "cpu": [
         "ia32"
       ],
@@ -3811,9 +3853,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.54.0.tgz",
-      "integrity": "sha512-dzAc53LOuFvHwbCEOS0rPbXp6SIhAf2txMP5p6mGyOXXw5mWY8NGGbPMPrs4P1WItkfApDathBj/NzMLUZ9rtQ==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.55.1.tgz",
+      "integrity": "sha512-xGGY5pXj69IxKb4yv/POoocPy/qmEGhimy/FoTpTSVju3FYXUQQMFCaZZXJVidsmGxRioZAwpThl/4zX41gRKg==",
       "cpu": [
         "x64"
       ],
@@ -3825,9 +3867,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.54.0.tgz",
-      "integrity": "sha512-hYT5d3YNdSh3mbCU1gwQyPgQd3T2ne0A3KG8KSBdav5TiBg6eInVmV+TeR5uHufiIgSFg0XsOWGW5/RhNcSvPg==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.55.1.tgz",
+      "integrity": "sha512-SPEpaL6DX4rmcXtnhdrQYgzQ5W2uW3SCJch88lB2zImhJRhIIK44fkUrgIV/Q8yUNfw5oyZ5vkeQsZLhCb06lw==",
       "cpu": [
         "x64"
       ],
@@ -3931,9 +3973,9 @@
       }
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.34.46",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.46.tgz",
-      "integrity": "sha512-kiW7CtS/NkdvTUjkjUJo7d5JsFfbJ14YjdhDk9KoEgK6nFjKNXZPrX0jfLA8ZlET4cFLHxOZ/0vFKOP+bOxIOQ==",
+      "version": "0.34.47",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.47.tgz",
+      "integrity": "sha512-ZGIBQ+XDvO5JQku9wmwtabcVTHJsgSWAHYtVuM9pBNNR5E88v6Jcj/llpmsjivig5X8A8HHOb4/mbEKPS5EvAw==",
       "dev": true,
       "license": "MIT"
     },
@@ -4305,9 +4347,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.4.tgz",
-      "integrity": "sha512-vnDVpYPMzs4wunl27jHrfmwojOGKya0xyM3sH+UE5iv5uPS6vX7UIoh6m+vQc5LGBq52HBKPIn/zcSZVzeDEZg==",
+      "version": "24.10.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.8.tgz",
+      "integrity": "sha512-r0bBaXu5Swb05doFYO2kTWHMovJnNVbCsII0fhesM8bNRlLhXIuckley4a2DaD+vOdmm5G+zGkQZAPZsF80+YQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4426,20 +4468,20 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.51.0.tgz",
-      "integrity": "sha512-XtssGWJvypyM2ytBnSnKtHYOGT+4ZwTnBVl36TA4nRO2f4PRNGz5/1OszHzcZCvcBMh+qb7I06uoCmLTRdR9og==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.53.0.tgz",
+      "integrity": "sha512-eEXsVvLPu8Z4PkFibtuFJLJOTAV/nPdgtSjkGoPpddpFk3/ym2oy97jynY6ic2m6+nc5M8SE1e9v/mHKsulcJg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.51.0",
-        "@typescript-eslint/type-utils": "8.51.0",
-        "@typescript-eslint/utils": "8.51.0",
-        "@typescript-eslint/visitor-keys": "8.51.0",
-        "ignore": "^7.0.0",
+        "@eslint-community/regexpp": "^4.12.2",
+        "@typescript-eslint/scope-manager": "8.53.0",
+        "@typescript-eslint/type-utils": "8.53.0",
+        "@typescript-eslint/utils": "8.53.0",
+        "@typescript-eslint/visitor-keys": "8.53.0",
+        "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.2.0"
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4449,23 +4491,23 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.51.0",
+        "@typescript-eslint/parser": "^8.53.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.51.0.tgz",
-      "integrity": "sha512-3xP4XzzDNQOIqBMWogftkwxhg5oMKApqY0BAflmLZiFYHqyhSOxv/cd/zPQLTcCXr4AkaKb25joocY0BD1WC6A==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.53.0.tgz",
+      "integrity": "sha512-npiaib8XzbjtzS2N4HlqPvlpxpmZ14FjSJrteZpPxGUaYPlvhzlzUZ4mZyABo0EFrOWnvyd0Xxroq//hKhtAWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.51.0",
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/typescript-estree": "8.51.0",
-        "@typescript-eslint/visitor-keys": "8.51.0",
-        "debug": "^4.3.4"
+        "@typescript-eslint/scope-manager": "8.53.0",
+        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/typescript-estree": "8.53.0",
+        "@typescript-eslint/visitor-keys": "8.53.0",
+        "debug": "^4.4.3"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4480,15 +4522,15 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.51.0.tgz",
-      "integrity": "sha512-Luv/GafO07Z7HpiI7qeEW5NW8HUtZI/fo/kE0YbtQEFpJRUuR0ajcWfCE5bnMvL7QQFrmT/odMe8QZww8X2nfQ==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.53.0.tgz",
+      "integrity": "sha512-Bl6Gdr7NqkqIP5yP9z1JU///Nmes4Eose6L1HwpuVHwScgDPPuEWbUVhvlZmb8hy0vX9syLk5EGNL700WcBlbg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.51.0",
-        "@typescript-eslint/types": "^8.51.0",
-        "debug": "^4.3.4"
+        "@typescript-eslint/tsconfig-utils": "^8.53.0",
+        "@typescript-eslint/types": "^8.53.0",
+        "debug": "^4.4.3"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4502,14 +4544,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.51.0.tgz",
-      "integrity": "sha512-JhhJDVwsSx4hiOEQPeajGhCWgBMBwVkxC/Pet53EpBVs7zHHtayKefw1jtPaNRXpI9RA2uocdmpdfE7T+NrizA==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.53.0.tgz",
+      "integrity": "sha512-kWNj3l01eOGSdVBnfAF2K1BTh06WS0Yet6JUgb9Cmkqaz3Jlu0fdVUjj9UI8gPidBWSMqDIglmEXifSgDT/D0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/visitor-keys": "8.51.0"
+        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/visitor-keys": "8.53.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4520,9 +4562,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.51.0.tgz",
-      "integrity": "sha512-Qi5bSy/vuHeWyir2C8u/uqGMIlIDu8fuiYWv48ZGlZ/k+PRPHtaAu7erpc7p5bzw2WNNSniuxoMSO4Ar6V9OXw==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.53.0.tgz",
+      "integrity": "sha512-K6Sc0R5GIG6dNoPdOooQ+KtvT5KCKAvTcY8h2rIuul19vxH5OTQk7ArKkd4yTzkw66WnNY0kPPzzcmWA+XRmiA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4537,17 +4579,17 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.51.0.tgz",
-      "integrity": "sha512-0XVtYzxnobc9K0VU7wRWg1yiUrw4oQzexCG2V2IDxxCxhqBMSMbjB+6o91A+Uc0GWtgjCa3Y8bi7hwI0Tu4n5Q==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.53.0.tgz",
+      "integrity": "sha512-BBAUhlx7g4SmcLhn8cnbxoxtmS7hcq39xKCgiutL3oNx1TaIp+cny51s8ewnKMpVUKQUGb41RAUWZ9kxYdovuw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/typescript-estree": "8.51.0",
-        "@typescript-eslint/utils": "8.51.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^2.2.0"
+        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/typescript-estree": "8.53.0",
+        "@typescript-eslint/utils": "8.53.0",
+        "debug": "^4.4.3",
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4562,9 +4604,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.51.0.tgz",
-      "integrity": "sha512-TizAvWYFM6sSscmEakjY3sPqGwxZRSywSsPEiuZF6d5GmGD9Gvlsv0f6N8FvAAA0CD06l3rIcWNbsN1e5F/9Ag==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.53.0.tgz",
+      "integrity": "sha512-Bmh9KX31Vlxa13+PqPvt4RzKRN1XORYSLlAE+sO1i28NkisGbTtSLFVB3l7PWdHtR3E0mVMuC7JilWJ99m2HxQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4576,21 +4618,21 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.51.0.tgz",
-      "integrity": "sha512-1qNjGqFRmlq0VW5iVlcyHBbCjPB7y6SxpBkrbhNWMy/65ZoncXCEPJxkRZL8McrseNH6lFhaxCIaX+vBuFnRng==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.53.0.tgz",
+      "integrity": "sha512-pw0c0Gdo7Z4xOG987u3nJ8akL9093yEEKv8QTJ+Bhkghj1xyj8cgPaavlr9rq8h7+s6plUJ4QJYw2gCZodqmGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.51.0",
-        "@typescript-eslint/tsconfig-utils": "8.51.0",
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/visitor-keys": "8.51.0",
-        "debug": "^4.3.4",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
+        "@typescript-eslint/project-service": "8.53.0",
+        "@typescript-eslint/tsconfig-utils": "8.53.0",
+        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/visitor-keys": "8.53.0",
+        "debug": "^4.4.3",
+        "minimatch": "^9.0.5",
+        "semver": "^7.7.3",
         "tinyglobby": "^0.2.15",
-        "ts-api-utils": "^2.2.0"
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4604,16 +4646,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.51.0.tgz",
-      "integrity": "sha512-11rZYxSe0zabiKaCP2QAwRf/dnmgFgvTmeDTtZvUvXG3UuAdg/GU02NExmmIXzz3vLGgMdtrIosI84jITQOxUA==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.53.0.tgz",
+      "integrity": "sha512-XDY4mXTez3Z1iRDI5mbRhH4DFSt46oaIFsLg+Zn97+sYrXACziXSQcSelMybnVZ5pa1P6xYkPr5cMJyunM1ZDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.51.0",
-        "@typescript-eslint/types": "8.51.0",
-        "@typescript-eslint/typescript-estree": "8.51.0"
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.53.0",
+        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/typescript-estree": "8.53.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4628,13 +4670,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.51.0.tgz",
-      "integrity": "sha512-mM/JRQOzhVN1ykejrvwnBRV3+7yTKK8tVANVN3o1O0t0v7o+jqdVu9crPy5Y9dov15TJk/FTIgoUGHrTOVL3Zg==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.53.0.tgz",
+      "integrity": "sha512-LZ2NqIHFhvFwxG0qZeLL9DvdNAHPGCY5dIRwBhyYeU+LfLhcStE1ImjsuTG/WaVh3XysGaeLW8Rqq7cGkPCFvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.51.0",
+        "@typescript-eslint/types": "8.53.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -5093,9 +5135,9 @@
       }
     },
     "node_modules/@whatwg-node/node-fetch": {
-      "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.8.4.tgz",
-      "integrity": "sha512-AlKLc57loGoyYlrzDbejB9EeR+pfdJdGzbYnkEuZaGekFboBwzfVYVMsy88PMriqPI1ORpiGYGgSSWpx7a2sDA==",
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.8.5.tgz",
+      "integrity": "sha512-4xzCl/zphPqlp9tASLVeUhB5+WJHbuWGYpfoC2q1qh5dw0AqZBW7L27V5roxYWijPxj4sspRAAoOH3d2ztaHUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5136,9 +5178,9 @@
       "license": "0BSD"
     },
     "node_modules/@whatwg-node/server": {
-      "version": "0.10.17",
-      "resolved": "https://registry.npmjs.org/@whatwg-node/server/-/server-0.10.17.tgz",
-      "integrity": "sha512-QxI+HQfJeI/UscFNCTcSri6nrHP25mtyAMbhEri7W2ctdb3EsorPuJz7IovSgNjvKVs73dg9Fmayewx1O2xOxA==",
+      "version": "0.10.18",
+      "resolved": "https://registry.npmjs.org/@whatwg-node/server/-/server-0.10.18.tgz",
+      "integrity": "sha512-kMwLlxUbduttIgaPdSkmEarFpP+mSY8FEm+QWMBRJwxOHWkri+cxd8KZHO9EMrB9vgUuz+5WEaCawaL5wGVoXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5574,9 +5616,9 @@
       "license": "MIT"
     },
     "node_modules/axe-core": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.0.tgz",
-      "integrity": "sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.11.1.tgz",
+      "integrity": "sha512-BASOg+YwO2C+346x3LZOeoovTIoTrRqEsqMa6fmfAV0P+U9mFr9NsyOEpiYvFjbc64NMrSswhV50WdXzdb/Z5A==",
       "dev": true,
       "license": "MPL-2.0",
       "engines": {
@@ -5724,9 +5766,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.9.11",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz",
-      "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==",
+      "version": "2.9.14",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.14.tgz",
+      "integrity": "sha512-B0xUquLkiGLgHhpPBqvl7GWegWBUNuujQ6kXd/r1U38ElPT6Ok8KZ8e+FpUGEc2ZoRQUzq/aUnaKFc/svWUGSg==",
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.js"
@@ -5965,9 +6007,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001762",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001762.tgz",
-      "integrity": "sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==",
+      "version": "1.0.30001764",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001764.tgz",
+      "integrity": "sha512-9JGuzl2M+vPL+pz70gtMF9sHdMFbY9FJaQBi186cHKH3pSzDvzoUJUPV6fqiKIMyXbud9ZLg4F3Yza1vJ1+93g==",
       "funding": [
         {
           "type": "opencollective",
@@ -6041,9 +6083,9 @@
       "license": "ISC"
     },
     "node_modules/check-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
-      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz",
+      "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6067,9 +6109,9 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.1.1.tgz",
-      "integrity": "sha512-+CmxIZ/L2vNcEfvNtLdU0ZQ6mbq3FZnwAP2PPTiKP+1QOoKwlKlPgb8UKV0Dds7QVaMnHm+FwSft2VB0s/SLjQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz",
+      "integrity": "sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -7721,20 +7763,20 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "61.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-61.5.0.tgz",
-      "integrity": "sha512-PR81eOGq4S7diVnV9xzFSBE4CDENRQGP0Lckkek8AdHtbj+6Bm0cItwlFnxsLFriJHspiE3mpu8U20eODyToIg==",
+      "version": "61.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-61.7.1.tgz",
+      "integrity": "sha512-36DpldF95MlTX//n3/naULFVt8d1cV4jmSkx7ZKrE9ikkKHAgMLesuWp1SmwpVwAs5ndIM6abKd6PeOYZUgdWg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@es-joy/jsdoccomment": "~0.76.0",
+        "@es-joy/jsdoccomment": "~0.78.0",
         "@es-joy/resolve.exports": "1.2.0",
         "are-docs-informative": "^0.0.2",
         "comment-parser": "1.4.1",
         "debug": "^4.4.3",
         "escape-string-regexp": "^4.0.0",
-        "espree": "^10.4.0",
-        "esquery": "^1.6.0",
+        "espree": "^11.0.0",
+        "esquery": "^1.7.0",
         "html-entities": "^2.6.0",
         "object-deep-merge": "^2.0.0",
         "parse-imports-exports": "^0.2.4",
@@ -7749,6 +7791,37 @@
         "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsdoc/node_modules/eslint-visitor-keys": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.0.tgz",
+      "integrity": "sha512-A0XeIi7CXU7nPlfHS9loMYEKxUaONu/hTEzHTGba9Huu94Cq1hPivf+DE5erJozZOky0LfvXAyrV/tcswpLI0Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/espree": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.0.0.tgz",
+      "integrity": "sha512-+gMeWRrIh/NsG+3NaLeWHuyeyk70p2tbvZIWBYcqQ4/7Xvars6GYTZNhF1sIeLcc6Wb11He5ffz3hsHyXFrw5A==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.15.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^5.0.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint-plugin-jsx-a11y": {
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.10.2.tgz",
@@ -11184,9 +11257,9 @@
       "license": "MIT"
     },
     "node_modules/jsdoc-type-pratt-parser": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-6.10.0.tgz",
-      "integrity": "sha512-+LexoTRyYui5iOhJGn13N9ZazL23nAHGkXsa1p/C8yeq79WRfLBag6ZZ0FQG2aRoc9yfo59JT9EYCQonOkHKkQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-7.0.0.tgz",
+      "integrity": "sha512-c7YbokssPOSHmqTbSAmTtnVgAVa/7lumWNYqomgd5KOMyPrRve2anx6lonfOsXEQacqF9FKVUj7bLg4vRSvdYA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13621,9 +13694,9 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.54.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.54.0.tgz",
-      "integrity": "sha512-3nk8Y3a9Ea8szgKhinMlGMhGMw89mqule3KWczxhIzqudyHdCIOHw8WJlj/r329fACjKLEh13ZSk7oE22kyeIw==",
+      "version": "4.55.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.55.1.tgz",
+      "integrity": "sha512-wDv/Ht1BNHB4upNbK74s9usvl7hObDnvVzknxqY/E/O3X6rW1U1rV1aENEfJ54eFZDTNo7zv1f5N4edCluH7+A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13637,28 +13710,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.54.0",
-        "@rollup/rollup-android-arm64": "4.54.0",
-        "@rollup/rollup-darwin-arm64": "4.54.0",
-        "@rollup/rollup-darwin-x64": "4.54.0",
-        "@rollup/rollup-freebsd-arm64": "4.54.0",
-        "@rollup/rollup-freebsd-x64": "4.54.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.54.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.54.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.54.0",
-        "@rollup/rollup-linux-arm64-musl": "4.54.0",
-        "@rollup/rollup-linux-loong64-gnu": "4.54.0",
-        "@rollup/rollup-linux-ppc64-gnu": "4.54.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.54.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.54.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.54.0",
-        "@rollup/rollup-linux-x64-gnu": "4.54.0",
-        "@rollup/rollup-linux-x64-musl": "4.54.0",
-        "@rollup/rollup-openharmony-arm64": "4.54.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.54.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.54.0",
-        "@rollup/rollup-win32-x64-gnu": "4.54.0",
-        "@rollup/rollup-win32-x64-msvc": "4.54.0",
+        "@rollup/rollup-android-arm-eabi": "4.55.1",
+        "@rollup/rollup-android-arm64": "4.55.1",
+        "@rollup/rollup-darwin-arm64": "4.55.1",
+        "@rollup/rollup-darwin-x64": "4.55.1",
+        "@rollup/rollup-freebsd-arm64": "4.55.1",
+        "@rollup/rollup-freebsd-x64": "4.55.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.55.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.55.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.55.1",
+        "@rollup/rollup-linux-arm64-musl": "4.55.1",
+        "@rollup/rollup-linux-loong64-gnu": "4.55.1",
+        "@rollup/rollup-linux-loong64-musl": "4.55.1",
+        "@rollup/rollup-linux-ppc64-gnu": "4.55.1",
+        "@rollup/rollup-linux-ppc64-musl": "4.55.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.55.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.55.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.55.1",
+        "@rollup/rollup-linux-x64-gnu": "4.55.1",
+        "@rollup/rollup-linux-x64-musl": "4.55.1",
+        "@rollup/rollup-openbsd-x64": "4.55.1",
+        "@rollup/rollup-openharmony-arm64": "4.55.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.55.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.55.1",
+        "@rollup/rollup-win32-x64-gnu": "4.55.1",
+        "@rollup/rollup-win32-x64-msvc": "4.55.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -13781,10 +13857,13 @@
       "license": "MIT"
     },
     "node_modules/sax": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz",
-      "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==",
-      "license": "BlueOak-1.0.0"
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.4.tgz",
+      "integrity": "sha512-1n3r/tGXO6b6VXMdFT54SHzT9ytu9yr7TaELowdYpMqY/Ao7EnlQGmAQ1+RatX7Tkkdm6hONI2owqNx2aZj5Sw==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=11.0.0"
+      }
     },
     "node_modules/saxes": {
       "version": "6.0.0",
@@ -15184,9 +15263,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.3.0.tgz",
-      "integrity": "sha512-6eg3Y9SF7SsAvGzRHQvvc1skDAhwI4YQ32ui1scxD1Ccr0G5qIIbUBT3pFTKX8kmWIQClHobtUdNuaBgwdfdWg==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
+      "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -15488,16 +15567,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.51.0.tgz",
-      "integrity": "sha512-jh8ZuM5oEh2PSdyQG9YAEM1TCGuWenLSuSUhf/irbVUNW9O5FhbFVONviN2TgMTBnUmyHv7E56rYnfLZK6TkiA==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.53.0.tgz",
+      "integrity": "sha512-xHURCQNxZ1dsWn0sdOaOfCSQG0HKeqSj9OexIxrz6ypU6wHYOdX2I3D2b8s8wFSsSOYJb+6q283cLiLlkEsBYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.51.0",
-        "@typescript-eslint/parser": "8.51.0",
-        "@typescript-eslint/typescript-estree": "8.51.0",
-        "@typescript-eslint/utils": "8.51.0"
+        "@typescript-eslint/eslint-plugin": "8.53.0",
+        "@typescript-eslint/parser": "8.53.0",
+        "@typescript-eslint/typescript-estree": "8.53.0",
+        "@typescript-eslint/utils": "8.53.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -15837,9 +15916,9 @@
       }
     },
     "node_modules/vite-node/node_modules/vite": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz",
-      "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
+      "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16090,9 +16169,9 @@
       }
     },
     "node_modules/vitest/node_modules/vite": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.0.tgz",
-      "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
+      "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16464,9 +16543,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
-      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+      "version": "8.19.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
+      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -16613,9 +16692,9 @@
       }
     },
     "node_modules/zod": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.4.tgz",
-      "integrity": "sha512-Zw/uYiiyF6pUT1qmKbZziChgNPRu+ZRneAsMUDU6IwmXdWt5JwcUfy2bvLOCUtz5UniaN/Zx5aFttZYbYc7O/A==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.5.tgz",
+      "integrity": "sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
diff --git a/package.json b/package.json
index 9a59e87a..118cb0a4 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "stylis": "^4.3.6",
     "swr": "^2.3.8",
     "xml2js": "^0.6.2",
-    "zod": "^4.3.4"
+    "zod": "^4.3.5"
   },
   "devDependencies": {
     "@eslint/js": "^9.28.0",
@@ -52,7 +52,7 @@
     "@types/heic-convert": "^2.1.0",
     "@types/jest": "^30.0.0",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^24.10.4",
+    "@types/node": "^24.10.8",
     "@types/react": "19.2.7",
     "@types/react-dom": "19.2.3",
     "@types/react-image-gallery": "^1.2.4",
@@ -63,7 +63,7 @@
     "eslint-config-next": "16.1.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest-dom": "^5.5.0",
-    "eslint-plugin-jsdoc": "^61.5.0",
+    "eslint-plugin-jsdoc": "^61.7.1",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-testing-library": "^7.15.4",
     "jest": "^30.2.0",
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 1d643e2b..e5a0e9e5 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -10,6 +10,7 @@ import useSWR from 'swr'
 import xml2js from 'xml2js'
 
 import type { Gallery, IndexedKeywords, ItemReferenceSource, RawXmlAlbum, RawXmlItem } from '../../types/common'
+import { transformReference } from '../../utils/reference'
 import ComboBox from '../ComboBox'
 import { type XmlItemState } from './AdminAlbumClient'
 
@@ -352,6 +353,21 @@ export default function Fields(
               title="Reference name/ID (ref.name)"
               sx={{ flex: 1, minWidth: 0 }}
             />
+            <IconButton
+              size="sm"
+              variant="outlined"
+              onClick={() => {
+                const reference = transformReference(editedItem?.ref)
+                if (reference) {
+                  navigator.clipboard.writeText(reference[0])
+                }
+              }}
+              disabled={!editedItem?.ref?.source || !editedItem?.ref?.name}
+              title="Copy reference URL to clipboard"
+              sx={{ minWidth: 'auto', px: 1 }}
+            >
+              📋
+            </IconButton>
           </Stack>
           <Button onClick={generateXml} variant="solid" color="primary">
             Generate XML
diff --git a/src/models/__tests__/album.test.ts b/src/models/__tests__/album.test.ts
index 6681f520..22c99228 100644
--- a/src/models/__tests__/album.test.ts
+++ b/src/models/__tests__/album.test.ts
@@ -1,6 +1,7 @@
-import config from '../config'
 import type { XmlAlbum, XmlItem } from '../../types/common'
-import transformJsonSchema, { transformPersons, transformReference } from '../album'
+import { transformReference } from '../../utils/reference'
+import transformJsonSchema, { transformPersons } from '../album'
+import config from '../config'
 
 describe('Album library', () => {
   describe('transformJsonSchema', () => {
@@ -193,7 +194,7 @@ describe('Album library', () => {
           source: 'youtube',
         },
       }
-      const actual = transformReference(mock)
+      const actual = transformReference(mock.ref)
       if (actual === null) {
         expect(actual).not.toBeNull()
       } else {
@@ -209,7 +210,7 @@ describe('Album library', () => {
           source: 'wikipedia',
         },
       }
-      const actual = transformReference(mock)
+      const actual = transformReference(mock.ref)
       if (actual === null) {
         expect(actual).not.toBeNull()
       } else {
diff --git a/src/models/album.ts b/src/models/album.ts
index 2b75308f..78d4fad5 100644
--- a/src/models/album.ts
+++ b/src/models/album.ts
@@ -1,16 +1,16 @@
-import config from './config'
 import utilsFactory from '../lib/utils'
 import type {
   Album,
   AlbumMeta,
   Item,
-  ItemReferenceSource,
   Person,
   PersonItem,
   XmlAlbum,
   XmlItem,
 } from '../types/common'
 import { isNotEmpty, removeUndefinedFields } from '../utils'
+import { transformReference } from '../utils/reference'
+import config from './config'
 
 export type ErrorOptionalMessage = { album: object[]; error?: { message: string } }
 export const errorSchema = (message: string): ErrorOptionalMessage => {
@@ -108,34 +108,6 @@ export const transformPersons = (photoSearchValues: XmlItem['search'], definedPe
   return null
 }
 
-export const transformReference = (item: XmlItem): [string, string] | null => {
-  const baseUrl = (source: ItemReferenceSource) => {
-    switch (source) {
-      case 'facebook':
-        return 'https://www.facebook.com/'
-      case 'google':
-        return 'https://www.google.com/search?q='
-      case 'instagram':
-        return 'https://www.instagram.com/'
-      case 'wikipedia':
-        return 'https://en.wikipedia.org/wiki/'
-      case 'youtube':
-        return 'https://www.youtube.com/watch?v='
-      default:
-        return null // Return null instead of throwing for unknown sources
-    }
-  }
-  if (!('ref' in item) || !item.ref) {
-    return null
-  }
-  if ('name' in item.ref && 'source' in item.ref) {
-    const url = baseUrl(item.ref.source)
-    if (!url) return null // Return null if source is invalid
-    return [url + item.ref.name, item.ref.name]
-  }
-  return null
-}
-
 function transformMeta(dirty: XmlAlbum): AlbumMeta {
   if (!isValidMeta(dirty)) {
     return {
@@ -225,7 +197,7 @@ const transformJsonSchema = (dirty: XmlAlbum, persons: Person[]): Album => {
       photoPath,
       mediaPath: (item.type === 'video' && videoPaths) ? videoPaths[0] : photoPath,
       videoPaths,
-      reference: transformReference(item),
+      reference: transformReference(item?.ref),
     }
 
     return removeUndefinedFields(out)
diff --git a/src/utils/reference.ts b/src/utils/reference.ts
new file mode 100644
index 00000000..520b7527
--- /dev/null
+++ b/src/utils/reference.ts
@@ -0,0 +1,25 @@
+import type { ItemReferenceSource, XmlItem } from '../types/common'
+
+export function buildReferenceUrl(source: ItemReferenceSource, name: string): string | null {
+  const baseUrls: Record<ItemReferenceSource, string> = {
+    facebook: 'https://www.facebook.com/',
+    google: 'https://www.google.com/search?q=',
+    instagram: 'https://www.instagram.com/',
+    wikipedia: 'https://en.wikipedia.org/wiki/',
+    youtube: 'https://www.youtube.com/watch?v=',
+  }
+
+  return baseUrls[source] + name
+}
+
+export function transformReference(ref: XmlItem['ref']): [string, string] | null {
+  if (!ref) {
+    return null
+  }
+  if ('name' in ref && 'source' in ref) {
+    const url = buildReferenceUrl(ref.source, ref.name)
+    if (!url) return null
+    return [url, ref.name]
+  }
+  return null
+}

From 27ebcf71addc9cc4c0b7763047df01a1f76d7c8f Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Wed, 14 Jan 2026 21:51:10 -0800
Subject: [PATCH 15/33] feat(Admin > Edit Album): Add Edit count pill

---
 .../AdminAlbum/AdminAlbumClient.tsx           |  28 ++---
 src/components/AdminAlbum/Fields.tsx          |  77 +++---------
 .../AdminAlbum/useEditCountPill.tsx           | 116 ++++++++++++++++++
 src/components/AdminAlbum/useGeoCopy.tsx      |  40 ++++++
 4 files changed, 186 insertions(+), 75 deletions(-)
 create mode 100644 src/components/AdminAlbum/useEditCountPill.tsx
 create mode 100644 src/components/AdminAlbum/useGeoCopy.tsx

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index 9505c435..3e30d036 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -15,6 +15,7 @@ import type { GalleryAlbum, RawXmlAlbum, RawXmlItem } from '../../types/common'
 import Fields from './Fields'
 import Photo from './Photo'
 import Thumbs from './Thumbs'
+import { useEditCountPill } from './useEditCountPill'
 
 export type XmlItemState = RawXmlItem | null
 
@@ -31,8 +32,7 @@ export default function AdminAlbumClient(
   const [searchQuery, setSearchQuery] = useState<string>('')
   const [searchResults, setSearchResults] = useState<SearchResult[]>([])
   const [isSearching, setIsSearching] = useState(false)
-  // Store edits for all items by ID - persist across photo switches
-  const [editedItems, setEditedItems] = useState<Record<string, RawXmlItem>>({})
+  const { EditCountPill, editedItems, handleItemUpdate, handleXmlGenerated, getItemWithEdits, clearEdits, applyEditsToItems } = useEditCountPill()
   const { data, error, mutate } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${currentGallery}/${album?.name}` : null, fetcher)
 
   const items = data?.album.item ? (Array.isArray(data.album.item) ? data.album.item : [data.album.item]) : []
@@ -84,7 +84,7 @@ export default function AdminAlbumClient(
     if (selectedAlbum) {
       setAlbum(selectedAlbum)
       // Clear edits when album changes
-      setEditedItems({})
+      clearEdits()
       setCurrentIndex(-1)
       setItem(null)
     }
@@ -98,7 +98,7 @@ export default function AdminAlbumClient(
       setCurrentGallery(newValue as Gallery)
       setAlbum(null)
       // Clear edits when gallery changes
-      setEditedItems({})
+      clearEdits()
       setItem(null)
       setCurrentIndex(-1)
     }
@@ -152,26 +152,18 @@ export default function AdminAlbumClient(
     }
   }, [currentIndex, items])
 
-  const handleItemUpdate = (updatedItem: RawXmlItem) => {
-    setEditedItems(prev => ({
-      ...prev,
-      [updatedItem.$.id]: updatedItem,
-    }))
-  }
-
-  // Get item with edits applied if they exist
-  const getItemWithEdits = (itemToGet: RawXmlItem | null): RawXmlItem | null => {
-    if (!itemToGet) return null
-    return editedItems[itemToGet.$.id] || itemToGet
-  }
-
   return (
     <form>
+        <EditCountPill />
         {item && <Fields
           xmlAlbum={data}
           gallery={currentGallery}
           item={getItemWithEdits(item)}
-          onItemUpdate={handleItemUpdate}          editedItems={editedItems}        >
+          onItemUpdate={handleItemUpdate}
+          onXmlGenerated={handleXmlGenerated}
+          editedItems={editedItems}
+          applyEditsToItems={applyEditsToItems}
+        >
           <Photo item={item} gallery={currentGallery} />
         </Fields>}
         <Stack
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index e5a0e9e5..7783d61d 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -13,6 +13,8 @@ import type { Gallery, IndexedKeywords, ItemReferenceSource, RawXmlAlbum, RawXml
 import { transformReference } from '../../utils/reference'
 import ComboBox from '../ComboBox'
 import { type XmlItemState } from './AdminAlbumClient'
+import type { EditCountPillHook } from './useEditCountPill'
+import { useGeoCopy } from './useGeoCopy'
 
 const fetcher = (url: string) => fetch(url).then(r => r.json())
 
@@ -42,20 +44,23 @@ function parseDMS(dms: string): number | null {
 }
 
 export default function Fields(
-  { xmlAlbum, gallery, item, children, onItemUpdate, editedItems }:
+  { xmlAlbum, gallery, item, children, onItemUpdate, onXmlGenerated, editedItems, applyEditsToItems }:
   {
     xmlAlbum: RawXmlAlbum | undefined,
     gallery: Gallery,
     item: XmlItemState,
     children: React.ReactElement,
-    onItemUpdate: (item: RawXmlItem) => void,
-    editedItems: Record<string, RawXmlItem>
+    onItemUpdate: EditCountPillHook['handleItemUpdate'],
+    onXmlGenerated: EditCountPillHook['handleXmlGenerated'],
+    editedItems: EditCountPillHook['editedItems'],
+    applyEditsToItems: EditCountPillHook['applyEditsToItems']
   },
 ) {
   const [editedItem, setEditedItem] = useState<RawXmlItem | null>(item)
   const [xmlOutput, setXmlOutput] = useState<string>('')
   const [autocompleteValue, setAutocompleteValue] = useState<string>('')
   const updatePendingRef = useRef(false)
+  const GeoCopyButton = useGeoCopy(editedItem)
 
   // Fetch all available keywords from all albums
   const { data: keywordsData } = useSWR<{ keywords: IndexedKeywords[] }>('/api/admin/keywords', fetcher)
@@ -87,39 +92,8 @@ export default function Fields(
     // Get all items from XML
     const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
 
-    // Helper to remove empty/null/undefined properties recursively
-    const removeEmpty = (obj: any): any => {
-      if (obj === null || obj === undefined || obj === '') return undefined
-      if (typeof obj !== 'object') return obj
-      if (Array.isArray(obj)) return obj.map(removeEmpty).filter((v) => v !== undefined)
-
-      const cleaned: any = {}
-      for (const [key, value] of Object.entries(obj)) {
-        const cleanedValue = removeEmpty(value)
-        if (cleanedValue !== undefined) {
-          cleaned[key] = cleanedValue
-        }
-      }
-      return Object.keys(cleaned).length > 0 ? cleaned : undefined
-    }
-
     // Apply all edits from editedItems state and maintain proper field ordering
-    const updatedItems = items.map((originalItem: RawXmlItem) => {
-      const edited = editedItems[originalItem.$.id]
-      if (!edited) return originalItem
-
-      // Reconstruct item with desired field order: search before geo
-      const { search, geo, ref, ...rest } = edited
-      const orderedItem = {
-        ...rest,
-        ...(search !== undefined && search !== null && search !== '' && { search }),
-        ...(geo && { geo }),
-        ...(ref && { ref }),
-      }
-
-      // Remove empty properties
-      return removeEmpty(orderedItem)
-    }).filter((item) => item !== undefined)
+    const updatedItems = applyEditsToItems(items)
 
     // Build XML album structure
     const albumXml = {
@@ -136,6 +110,9 @@ export default function Fields(
 
     const xml = builder.buildObject(albumXml)
     setXmlOutput(xml)
+
+    // Reset the counter of edits since generation
+    onXmlGenerated()
   }
 
   const filename = editedItem?.filename ? (Array.isArray(editedItem.filename) ? editedItem.filename[0] : editedItem.filename) : ''
@@ -169,12 +146,6 @@ export default function Fields(
             placeholder="Location"
             title="Location (photo_loc)"
           />
-          <Input
-            value={editedItem?.thumb_caption ?? ''}
-            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, thumb_caption: e.target.value } : null)}
-            placeholder="Caption"
-            title="Caption (thumb_caption)"
-          />
           <Textarea
             value={editedItem?.photo_desc ?? ''}
             onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_desc: e.target.value } : null)}
@@ -182,6 +153,12 @@ export default function Fields(
             title="Description (photo_desc)"
             minRows={2}
           />
+          <Input
+            value={editedItem?.thumb_caption ?? ''}
+            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, thumb_caption: e.target.value } : null)}
+            placeholder="Caption"
+            title="Caption (thumb_caption)"
+          />
           <Input
             value={editedItem?.search ?? ''}
             onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, search: e.target.value } : null)}
@@ -291,22 +268,8 @@ export default function Fields(
               title="Longitude (geo.lon) - paste DMS format to convert"
               sx={{ flex: 1, minWidth: 0 }}
             />
-            <IconButton
-              size="sm"
-              variant="outlined"
-              onClick={() => {
-                const lat = editedItem?.geo?.lat ?? ''
-                const lon = editedItem?.geo?.lon ?? ''
-                if (lat && lon) {
-                  navigator.clipboard.writeText(`${lat},${lon}`)
-                }
-              }}
-              disabled={!editedItem?.geo?.lat || !editedItem?.geo?.lon}
-              title="Copy lat,lon to clipboard"
-              sx={{ minWidth: 'auto', px: 1 }}
-            >
-              📋
-            </IconButton>
+            <GeoCopyButton />
+
             <Input
               value={editedItem?.geo?.accuracy ?? ''}
               onChange={(e) => {
diff --git a/src/components/AdminAlbum/useEditCountPill.tsx b/src/components/AdminAlbum/useEditCountPill.tsx
new file mode 100644
index 00000000..1fa1d96f
--- /dev/null
+++ b/src/components/AdminAlbum/useEditCountPill.tsx
@@ -0,0 +1,116 @@
+import Chip from '@mui/joy/Chip'
+import type { JSX } from 'react'
+import { useState } from 'react'
+import type { RawXmlItem } from '../../types/common'
+
+export type EditCountPillHook = {
+  EditCountPill: () => JSX.Element | null
+  editedItems: Record<string, RawXmlItem>
+  handleItemUpdate: (updatedItem: RawXmlItem) => void
+  handleXmlGenerated: () => void
+  getItemWithEdits: (itemToGet: RawXmlItem | null) => RawXmlItem | null
+  clearEdits: () => void
+  applyEditsToItems: (items: RawXmlItem[]) => RawXmlItem[]
+}
+
+export function useEditCountPill(): EditCountPillHook {
+  // Store edits for all items by ID - persist across photo switches
+  const [editedItems, setEditedItems] = useState<Record<string, RawXmlItem>>({})
+  // Track edits made since last XML generation
+  const [editsSinceGeneration, setEditsSinceGeneration] = useState<Set<string>>(new Set())
+
+  const handleItemUpdate = (updatedItem: RawXmlItem) => {
+    setEditedItems(prev => ({
+      ...prev,
+      [updatedItem.$.id]: updatedItem,
+    }))
+    // Track this item as edited since last generation
+    setEditsSinceGeneration(prev => new Set(prev).add(updatedItem.$.id))
+  }
+
+  const handleXmlGenerated = () => {
+    // Reset the counter of edits since generation, but keep the actual edits
+    setEditsSinceGeneration(new Set())
+  }
+
+  const clearEdits = () => {
+    setEditedItems({})
+    setEditsSinceGeneration(new Set())
+  }
+
+  // Get item with edits applied if they exist
+  const getItemWithEdits = (itemToGet: RawXmlItem | null): RawXmlItem | null => {
+    if (!itemToGet) return null
+    return editedItems[itemToGet.$.id] || itemToGet
+  }
+
+  // Helper to remove empty/null/undefined properties recursively
+  const removeEmpty = (obj: any): any => {
+    if (obj === null || obj === undefined || obj === '') return undefined
+    if (typeof obj !== 'object') return obj
+    if (Array.isArray(obj)) return obj.map(removeEmpty).filter((v) => v !== undefined)
+
+    const cleaned: any = {}
+    for (const [key, value] of Object.entries(obj)) {
+      const cleanedValue = removeEmpty(value)
+      if (cleanedValue !== undefined) {
+        cleaned[key] = cleanedValue
+      }
+    }
+    return Object.keys(cleaned).length > 0 ? cleaned : undefined
+  }
+
+  // Apply all edits from editedItems state and maintain proper field ordering
+  const applyEditsToItems = (items: RawXmlItem[]): RawXmlItem[] => {
+    return items.map((originalItem: RawXmlItem) => {
+      const edited = editedItems[originalItem.$.id]
+      if (!edited) return originalItem
+
+      // Reconstruct item with desired field order: search before geo
+      const { search, geo, ref, ...rest } = edited
+      const orderedItem = {
+        ...rest,
+        ...(search !== undefined && search !== null && search !== '' && { search }),
+        ...(geo && { geo }),
+        ...(ref && { ref }),
+      }
+
+      // Remove empty properties
+      return removeEmpty(orderedItem)
+    }).filter((item) => item !== undefined)
+  }
+
+  const EditCountPill = () => {
+    const count = editsSinceGeneration.size
+    if (count === 0) return null
+
+    return (
+      <Chip
+        color="primary"
+        size="lg"
+        variant="solid"
+        sx={{
+          position: 'fixed',
+          top: '1rem',
+          left: '50%',
+          transform: 'translateX(-50%)',
+          zIndex: 1000,
+          fontSize: '1rem',
+          paddingX: '1.5rem',
+          paddingY: '0.75rem',
+          boxShadow: '0 4px 12px rgba(0, 0, 0, 0.15)',
+          animation: count > 0 ? 'pulse 0.3s ease-in-out' : 'none',
+          '@keyframes pulse': {
+            '0%': { transform: 'translateX(-50%) scale(1)' },
+            '50%': { transform: 'translateX(-50%) scale(1.1)' },
+            '100%': { transform: 'translateX(-50%) scale(1)' },
+          },
+        }}
+      >
+        {count} {count === 1 ? 'photo edited' : 'photos edited'}
+      </Chip>
+    )
+  }
+
+  return { EditCountPill, editedItems, handleItemUpdate, handleXmlGenerated, getItemWithEdits, clearEdits, applyEditsToItems }
+}
diff --git a/src/components/AdminAlbum/useGeoCopy.tsx b/src/components/AdminAlbum/useGeoCopy.tsx
new file mode 100644
index 00000000..60a48889
--- /dev/null
+++ b/src/components/AdminAlbum/useGeoCopy.tsx
@@ -0,0 +1,40 @@
+import IconButton from '@mui/joy/IconButton'
+import { useState } from 'react'
+import type { RawXmlItem } from '../../types/common'
+
+export function useGeoCopy(editedItem: RawXmlItem | null) {
+  const [copyMode, setCopyMode] = useState<'coords' | 'maps'>('coords')
+
+  const copyGeoCoordinates = () => {
+    const lat = editedItem?.geo?.lat ?? ''
+    const lon = editedItem?.geo?.lon ?? ''
+
+    if (!lat || !lon) return
+
+    if (copyMode === 'coords') {
+      navigator.clipboard.writeText(`${lat}, ${lon}`)
+      setCopyMode('maps')
+    } else {
+      navigator.clipboard.writeText(`https://www.google.ca/maps/place/${lat}, ${lon}`)
+      setCopyMode('coords')
+    }
+  }
+
+  const title = copyMode === 'coords' ? 'Copy coordinates' : 'Copy Google Maps URL'
+  const disabled = !editedItem?.geo?.lat || !editedItem?.geo?.lon
+
+  const GeoCopyButton = () => (
+    <IconButton
+      size="sm"
+      variant="outlined"
+      onClick={copyGeoCoordinates}
+      disabled={disabled}
+      title={title}
+      sx={{ minWidth: 'auto', px: 1 }}
+    >
+      📋
+    </IconButton>
+  )
+
+  return GeoCopyButton
+}

From e64099f30053b1c5c964374498a9afe18e39380f Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Thu, 15 Jan 2026 20:24:30 -0800
Subject: [PATCH 16/33] feat(View Album > useSearch): Add Expand button

---
 src/components/Album/AlbumClient.tsx |  4 ++-
 src/hooks/useMapFilter.ts            |  2 +-
 src/hooks/useSearch.tsx              | 44 ++++++++++++++++++++++------
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/components/Album/AlbumClient.tsx b/src/components/Album/AlbumClient.tsx
index bc9b55af..0808417f 100644
--- a/src/components/Album/AlbumClient.tsx
+++ b/src/components/Album/AlbumClient.tsx
@@ -39,7 +39,9 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
   useEffect(() => {
     if (!selectId || itemsToShow.length === 0) return
     const idx = itemsToShow.findIndex(i => i.id === selectId)
-    if (idx >= 0) {
+
+    // Only slide if we found the item (idx >= 0) AND the gallery isn't already at that index
+    if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
       refImageGallery.current?.slideToIndex(idx)
       setMemoryIndex(idx)
     }
diff --git a/src/hooks/useMapFilter.ts b/src/hooks/useMapFilter.ts
index c42b849e..b76528c5 100644
--- a/src/hooks/useMapFilter.ts
+++ b/src/hooks/useMapFilter.ts
@@ -25,7 +25,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     keyword,
     searchBox,
     setVisibleCount,
-  } = useSearch({ items, setMemoryIndex, indexedKeywords })
+  } = useSearch({ items, setMemoryIndex, indexedKeywords, refImageGallery })
 
   const [mapFilterEnabled, setMapFilterEnabled] = useState(false)
   const [mapBounds, setMapBounds] = useState<Bounds | null>(null)
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index 586c8fbb..6e93b1c7 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -19,12 +19,14 @@ interface UseSearchProps<ItemType> {
   items: ItemType[];
   setMemoryIndex?: Dispatch<SetStateAction<number>>;
   indexedKeywords?: IndexedKeywords[];
+  refImageGallery?: React.RefObject<any>;
 }
 
 export default function useSearch<ItemType extends ServerSideItem>({
   items,
   setMemoryIndex,
   indexedKeywords = [],
+  refImageGallery,
 }: UseSearchProps<ItemType>) {
   const searchParams = useSearchParams()
   const router = useRouter()
@@ -165,6 +167,19 @@ export default function useSearch<ItemType extends ServerSideItem>({
     router.replace(pathname)
   }
 
+  const handleExpand = () => {
+    // Get current photo ID from filtered items (what's currently shown in gallery)
+    const currentIndex = refImageGallery?.current?.getCurrentIndex?.() ?? 0
+    const currentItem = filtered[currentIndex]
+    if (!currentItem) return
+
+    const photoId = (currentItem as any).id || (currentItem as any).name // album.name
+    if (!photoId) return
+
+    // Replace URL with select parameter - this removes keyword and triggers select logic
+    router.replace(`${pathname}?select=${photoId}`)
+  }
+
   const keywordResultLabel = keyword ? <> for &quot;{keyword}&quot;</> : null
 
   const searchBox = (
@@ -190,15 +205,26 @@ export default function useSearch<ItemType extends ServerSideItem>({
           Filter
         </Button>
         {keyword && (
-          <Button
-            type="button"
-            onClick={handleClear}
-            color="primary"
-            variant="soft"
-            title="Clear search"
-          >
-            Clear
-          </Button>
+          <>
+            <Button
+              type="button"
+              onClick={handleClear}
+              color="primary"
+              variant="soft"
+              title="Clear search"
+            >
+              Clear
+            </Button>
+            <Button
+              type="button"
+              onClick={handleExpand}
+              color="primary"
+              variant="soft"
+              title="Clear search and view adjacent photos"
+            >
+              Expand
+            </Button>
+          </>
         )}
       </div>
     </form>

From 75a2bf2c326dd3993f5dc53637dbd748c8efd6ce Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 17 Jan 2026 10:57:10 -0800
Subject: [PATCH 17/33] feat(View Album > useSearch): Add Bookmark button

---
 src/hooks/useBookmark.tsx | 44 +++++++++++++++++++++++++++++++++++++++
 src/hooks/useMapFilter.ts |  6 ++++++
 src/hooks/useMemory.tsx   |  2 +-
 src/hooks/useSearch.tsx   | 15 +++++++++++--
 4 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 src/hooks/useBookmark.tsx

diff --git a/src/hooks/useBookmark.tsx b/src/hooks/useBookmark.tsx
new file mode 100644
index 00000000..1bf2a999
--- /dev/null
+++ b/src/hooks/useBookmark.tsx
@@ -0,0 +1,44 @@
+'use client'
+
+import { Button } from '@mui/joy'
+import type { RefObject } from 'react'
+
+interface UseBookmarkProps<ItemType> {
+  refImageGallery?: RefObject<any>
+  displayedItems: ItemType[]
+  pathname: string
+}
+
+export default function useBookmark<ItemType>({
+  refImageGallery,
+  displayedItems,
+  pathname,
+}: UseBookmarkProps<ItemType>) {
+  const handleBookmark = () => {
+    // Get current photo ID from displayed items (respects map filter)
+    const currentIndex = refImageGallery?.current?.getCurrentIndex?.() ?? 0
+    const currentItem = displayedItems[currentIndex]
+    if (!currentItem) return
+
+    const photoId = (currentItem as any).id || (currentItem as any).name
+    if (!photoId) return
+
+    // Copy bookmark URL to clipboard
+    const bookmarkUrl = `${window.location.origin}${pathname}?select=${photoId}`
+    navigator.clipboard.writeText(bookmarkUrl)
+  }
+
+  const BookmarkButton = () => (
+    <Button
+      type="button"
+      onClick={handleBookmark}
+      color="primary"
+      variant="soft"
+      title="Copy bookmark URL to clipboard"
+    >
+      Bookmark
+    </Button>
+  )
+
+  return { BookmarkButton, handleBookmark }
+}
diff --git a/src/hooks/useMapFilter.ts b/src/hooks/useMapFilter.ts
index b76528c5..ab9bd4e2 100644
--- a/src/hooks/useMapFilter.ts
+++ b/src/hooks/useMapFilter.ts
@@ -25,6 +25,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     keyword,
     searchBox,
     setVisibleCount,
+    setDisplayedItems,
   } = useSearch({ items, setMemoryIndex, indexedKeywords, refImageGallery })
 
   const [mapFilterEnabled, setMapFilterEnabled] = useState(false)
@@ -56,6 +57,11 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     })
   }, [mapFilterEnabled, mapBounds, filtered])
 
+  // Update displayed items whenever itemsToShow changes
+  useEffect(() => {
+    setDisplayedItems(itemsToShow)
+  }, [itemsToShow, setDisplayedItems])
+
   // Pass suppression flag to useMemory
   const { setViewed, memoryHtml, viewedList } = useMemory(
     itemsToShow,
diff --git a/src/hooks/useMemory.tsx b/src/hooks/useMemory.tsx
index 30e72d53..33b48109 100644
--- a/src/hooks/useMemory.tsx
+++ b/src/hooks/useMemory.tsx
@@ -61,7 +61,7 @@ const useMemory = (
         {Array.isArray(details.filename) ? details.filename.join(', ') : String(details.filename)}
       </h5>
       {details.reference && details.reference.length >= 2 && (
-        <Link href={details.reference[0]}>
+        <Link href={details.reference[0]} target='_blank'>
           {decodeURI(details.reference[1]).replaceAll('_', ' ')}
         </Link>
       )}
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index 6e93b1c7..acf6d6dd 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -9,6 +9,7 @@ import {
 } from 'react'
 import AutoComplete from '../components/ComboBox'
 import { IndexedKeywords } from '../types/common'
+import useBookmark from './useBookmark'
 import styles from './search.module.css'
 
 interface ServerSideItem {
@@ -39,6 +40,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
   )
   const [inputValue, setInputValue] = useState<string>(initialKeyword)
   const [filteredItems, setFilteredItems] = useState<ItemType[]>(items)
+  const [displayedItems, setDisplayedItems] = useState<ItemType[]>(items)
 
   // Count of currently visible thumbnails (consumer can override this if needed)
   const [visibleCount, setVisibleCount] = useState<number>(items.length)
@@ -168,9 +170,10 @@ export default function useSearch<ItemType extends ServerSideItem>({
   }
 
   const handleExpand = () => {
-    // Get current photo ID from filtered items (what's currently shown in gallery)
+    // Get current photo ID from displayed items (respects map filter)
     const currentIndex = refImageGallery?.current?.getCurrentIndex?.() ?? 0
-    const currentItem = filtered[currentIndex]
+    const itemsToUse = displayedItems || filtered
+    const currentItem = itemsToUse[currentIndex]
     if (!currentItem) return
 
     const photoId = (currentItem as any).id || (currentItem as any).name // album.name
@@ -180,6 +183,12 @@ export default function useSearch<ItemType extends ServerSideItem>({
     router.replace(`${pathname}?select=${photoId}`)
   }
 
+  const { BookmarkButton } = useBookmark({
+    refImageGallery,
+    displayedItems: displayedItems || filtered,
+    pathname,
+  })
+
   const keywordResultLabel = keyword ? <> for &quot;{keyword}&quot;</> : null
 
   const searchBox = (
@@ -226,6 +235,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
             </Button>
           </>
         )}
+        <BookmarkButton />
       </div>
     </form>
   )
@@ -256,5 +266,6 @@ export default function useSearch<ItemType extends ServerSideItem>({
     searchBox,
     setVisibleCount: setVisibleCountStable,
     setFiltered: setFilteredItems,
+    setDisplayedItems,
   }
 }

From 8054ca6436f762d8186db9806472242b3da0b1ae Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 17 Jan 2026 11:46:45 -0800
Subject: [PATCH 18/33] chore(View Album > useSearch): Fix Expand button to
 clear Map Filter too

---
 src/hooks/useMapFilter.ts | 25 +++++++++++++----
 src/hooks/useSearch.tsx   | 56 ++++++++++++++++++++++++---------------
 2 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/src/hooks/useMapFilter.ts b/src/hooks/useMapFilter.ts
index ab9bd4e2..227b2dee 100644
--- a/src/hooks/useMapFilter.ts
+++ b/src/hooks/useMapFilter.ts
@@ -20,17 +20,32 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     })
   }, [])
 
+  const [mapFilterEnabled, setMapFilterEnabled] = useState(false)
+  const [mapBounds, setMapBounds] = useState<Bounds | null>(null)
+  const [selectedId, setSelectedId] = useState<string | null>(null)
+
+  const handleClearMapFilter = useCallback(() => {
+    // Delay disabling map filter to prevent map jump during expand
+    setTimeout(() => {
+      setMapFilterEnabled(false)
+      setMapBounds(null)
+    }, 100)
+  }, [])
+
   const {
     filtered,
     keyword,
     searchBox,
     setVisibleCount,
     setDisplayedItems,
-  } = useSearch({ items, setMemoryIndex, indexedKeywords, refImageGallery })
-
-  const [mapFilterEnabled, setMapFilterEnabled] = useState(false)
-  const [mapBounds, setMapBounds] = useState<Bounds | null>(null)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
+  } = useSearch({
+    items,
+    setMemoryIndex,
+    indexedKeywords,
+    refImageGallery,
+    mapFilterEnabled,
+    onClearMapFilter: handleClearMapFilter,
+  })
 
   const handleBoundsChange = useCallback((bounds: Bounds) => {
     if (!bounds) return
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index acf6d6dd..bdaf7b07 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -21,6 +21,8 @@ interface UseSearchProps<ItemType> {
   setMemoryIndex?: Dispatch<SetStateAction<number>>;
   indexedKeywords?: IndexedKeywords[];
   refImageGallery?: React.RefObject<any>;
+  mapFilterEnabled?: boolean;
+  onClearMapFilter?: () => void;
 }
 
 export default function useSearch<ItemType extends ServerSideItem>({
@@ -28,6 +30,8 @@ export default function useSearch<ItemType extends ServerSideItem>({
   setMemoryIndex,
   indexedKeywords = [],
   refImageGallery,
+  mapFilterEnabled,
+  onClearMapFilter,
 }: UseSearchProps<ItemType>) {
   const searchParams = useSearchParams()
   const router = useRouter()
@@ -179,7 +183,17 @@ export default function useSearch<ItemType extends ServerSideItem>({
     const photoId = (currentItem as any).id || (currentItem as any).name // album.name
     if (!photoId) return
 
-    // Replace URL with select parameter - this removes keyword and triggers select logic
+    // Clear search state
+    setKeyword('')
+    setSelectedOption(null)
+    setInputValue('')
+
+    // Clear map filter if enabled
+    if (mapFilterEnabled && onClearMapFilter) {
+      onClearMapFilter()
+    }
+
+    // Replace URL with select parameter - this removes keyword and map filter state
     router.replace(`${pathname}?select=${photoId}`)
   }
 
@@ -214,26 +228,26 @@ export default function useSearch<ItemType extends ServerSideItem>({
           Filter
         </Button>
         {keyword && (
-          <>
-            <Button
-              type="button"
-              onClick={handleClear}
-              color="primary"
-              variant="soft"
-              title="Clear search"
-            >
-              Clear
-            </Button>
-            <Button
-              type="button"
-              onClick={handleExpand}
-              color="primary"
-              variant="soft"
-              title="Clear search and view adjacent photos"
-            >
-              Expand
-            </Button>
-          </>
+          <Button
+            type="button"
+            onClick={handleClear}
+            color="primary"
+            variant="soft"
+            title="Clear search"
+          >
+            Clear
+          </Button>
+        )}
+        {(mapFilterEnabled || keyword) && (
+          <Button
+            type="button"
+            onClick={handleExpand}
+            color="primary"
+            variant="soft"
+            title="Clear search and view adjacent photos"
+          >
+            Expand
+          </Button>
         )}
         <BookmarkButton />
       </div>

From b2863f09e6ca32e54ca6c235c41c399badcc3da7 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 17 Jan 2026 14:21:54 -0800
Subject: [PATCH 19/33] chore(View All > useSearch): Fix Expand button; select
 filename as id

---
 src/components/Album/AlbumClient.tsx     | 13 +++-
 src/components/All/AllClient.tsx         | 30 +++++++-
 src/components/Persons/PersonsClient.tsx | 30 +++++++-
 src/components/SplitViewer/index.tsx     | 28 +++++--
 src/hooks/useBookmark.tsx                |  9 ++-
 src/hooks/useMapFilter.ts                | 94 +++++++++++++++++-------
 src/hooks/usePersonsFilter.tsx           |  4 +
 src/hooks/useSearch.tsx                  | 27 +++++--
 8 files changed, 190 insertions(+), 45 deletions(-)

diff --git a/src/components/Album/AlbumClient.tsx b/src/components/Album/AlbumClient.tsx
index 0808417f..c0df7773 100644
--- a/src/components/Album/AlbumClient.tsx
+++ b/src/components/Album/AlbumClient.tsx
@@ -31,6 +31,8 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
+    isExpanding,
+    expandCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
   const searchParams = useSearchParams()
@@ -38,7 +40,15 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
 
   useEffect(() => {
     if (!selectId || itemsToShow.length === 0) return
-    const idx = itemsToShow.findIndex(i => i.id === selectId)
+    let idx = itemsToShow.findIndex(i => i.id === selectId)
+
+    // Fallback: try matching by filename (for All view where IDs may not be unique)
+    if (idx < 0) {
+      idx = itemsToShow.findIndex(i => {
+        const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+        return filename === selectId
+      })
+    }
 
     // Only slide if we found the item (idx >= 0) AND the gallery isn't already at that index
     if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
@@ -60,6 +70,7 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
+          isExpanding={isExpanding}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/All/AllClient.tsx b/src/components/All/AllClient.tsx
index 6ad2fb4d..d3ecb4fa 100644
--- a/src/components/All/AllClient.tsx
+++ b/src/components/All/AllClient.tsx
@@ -1,6 +1,7 @@
 'use client'
 
-import { useMemo } from 'react'
+import { useMemo, useEffect } from 'react'
+import { useSearchParams } from 'next/navigation'
 
 import config from '../../../src/models/config'
 import useMapFilter from '../../hooks/useMapFilter'
@@ -24,8 +25,33 @@ export default function AllClient({ items, indexedKeywords, clusteredMarkers }:
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
+    isExpanding,
+    expandCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
+  const searchParams = useSearchParams()
+  const selectId = searchParams.get('select')
+
+  // Handle URL ?select= parameter
+  useEffect(() => {
+    if (!selectId || itemsToShow.length === 0) return
+    let idx = itemsToShow.findIndex(i => i.id === selectId)
+
+    // Fallback: try matching by filename
+    if (idx < 0) {
+      idx = itemsToShow.findIndex(i => {
+        const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+        return filename === selectId
+      })
+    }
+
+    // Only slide if found and not already at that index
+    if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
+      refImageGallery.current?.slideToIndex(idx)
+      setMemoryIndex(idx)
+    }
+  }, [selectId, itemsToShow, refImageGallery, setMemoryIndex])
+
   return (
     <div>
       <AlbumContext.Provider value={zooms}>
@@ -39,6 +65,8 @@ export default function AllClient({ items, indexedKeywords, clusteredMarkers }:
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
+          isExpanding={isExpanding}
+          expandCoordinates={expandCoordinates}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/Persons/PersonsClient.tsx b/src/components/Persons/PersonsClient.tsx
index 46368af3..f1c61484 100644
--- a/src/components/Persons/PersonsClient.tsx
+++ b/src/components/Persons/PersonsClient.tsx
@@ -1,6 +1,7 @@
 'use client'
 
-import { useMemo } from 'react'
+import { useMemo, useEffect } from 'react'
+import { useSearchParams } from 'next/navigation'
 
 import config from '../../../src/models/config'
 import usePersonsFilter from '../../hooks/usePersonsFilter'
@@ -25,6 +26,8 @@ export default function PersonsClient({
     mapFilterEnabled,
     handleToggleMapFilter,
     handleBoundsChange,
+    isExpanding,
+    expandCoordinates,
     controls,
     ageFiltered,
     itemsWithCorpus,
@@ -32,6 +35,29 @@ export default function PersonsClient({
     overrideAgeSummary,
   } = usePersonsFilter({ items, indexedKeywords, initialAgeSummary })
 
+  const searchParams = useSearchParams()
+  const selectId = searchParams.get('select')
+
+  // Handle URL ?select= parameter
+  useEffect(() => {
+    if (!selectId || ageFiltered.length === 0) return
+    let idx = ageFiltered.findIndex(i => i.id === selectId)
+
+    // Fallback: try matching by filename
+    if (idx < 0) {
+      idx = ageFiltered.findIndex(i => {
+        const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+        return filename === selectId
+      })
+    }
+
+    // Only slide if found and not already at that index
+    if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
+      refImageGallery.current?.slideToIndex(idx)
+      setMemoryIndex(idx)
+    }
+  }, [selectId, ageFiltered, refImageGallery, setMemoryIndex])
+
   // Replace controls age list if override available
   const finalControls = overrideAgeSummary ?? controls
 
@@ -51,6 +77,8 @@ export default function PersonsClient({
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
+          isExpanding={isExpanding}
+          expandCoordinates={expandCoordinates}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/SplitViewer/index.tsx b/src/components/SplitViewer/index.tsx
index 00a4575d..01b80e29 100644
--- a/src/components/SplitViewer/index.tsx
+++ b/src/components/SplitViewer/index.tsx
@@ -68,6 +68,8 @@ function SplitViewer({
   memoryIndex,
   setMemoryIndex,
   mapFilterEnabled,
+  isExpanding,
+  expandCoordinates,
   onToggleMapFilter,
   onMapBoundsChange,
 }: {
@@ -78,6 +80,8 @@ function SplitViewer({
   memoryIndex: number;
   setMemoryIndex: (n: number) => void;
   mapFilterEnabled?: boolean;
+  isExpanding?: boolean;
+  expandCoordinates?: [number, number] | null;
   onToggleMapFilter?: () => void;
   onMapBoundsChange?: (bounds: [[number, number],[number, number]]) => void;
 }) {
@@ -113,15 +117,28 @@ function SplitViewer({
   // Dynamic centroid (always reflects current selected item)
   const dynamicCentroid = (safeIndex === -1 || items.length === 0) ? null : items[safeIndex]
 
-  // Locked centroid used while map filter is ON (prevents panning / zooming with next/prev)
+  // Locked centroid used while map filter is ON or during expand
   const [lockedCentroid, setLockedCentroid] = useState<typeof dynamicCentroid>(dynamicCentroid)
 
-  // Update the locked centroid only when map filter is OFF (so user navigation recenters map)
+  // Lock centroid when expand starts with preserved coordinates
   useEffect(() => {
-    if (!mapFilterEnabled) {
+    if (isExpanding && expandCoordinates && dynamicCentroid) {
+      setLockedCentroid({
+        ...dynamicCentroid,
+        coordinates: expandCoordinates,
+      } as Item)
+    }
+  }, [isExpanding, expandCoordinates])
+
+  // Update locked centroid during normal navigation only
+  useEffect(() => {
+    if (!mapFilterEnabled && !isExpanding && dynamicCentroid) {
       setLockedCentroid(dynamicCentroid)
     }
-  }, [mapFilterEnabled, dynamicCentroid])
+  }, [mapFilterEnabled, isExpanding, dynamicCentroid])
+
+  // Always use locked centroid during filter or expand, dynamic otherwise
+  const effectiveCentroid = (mapFilterEnabled || isExpanding) ? lockedCentroid : dynamicCentroid
 
   // Only pass startIndex on first mount; afterward let the gallery manage its own state
   const initialIndexRef = useRef(safeIndex)
@@ -181,8 +198,7 @@ function SplitViewer({
             mapRef={mapRef}
             clusteredMarkers={clusteredMarkers}
             items={items}
-            // If filter ON: keep using locked centroid (no pan). If OFF: follow selection.
-            centroid={mapFilterEnabled ? lockedCentroid : dynamicCentroid}
+            centroid={effectiveCentroid}
             mapFilterEnabled={mapFilterEnabled}
             onToggleMapFilter={onToggleMapFilter}
             onBoundsChange={onMapBoundsChange}
diff --git a/src/hooks/useBookmark.tsx b/src/hooks/useBookmark.tsx
index 1bf2a999..5516c3c8 100644
--- a/src/hooks/useBookmark.tsx
+++ b/src/hooks/useBookmark.tsx
@@ -20,11 +20,14 @@ export default function useBookmark<ItemType>({
     const currentItem = displayedItems[currentIndex]
     if (!currentItem) return
 
-    const photoId = (currentItem as any).id || (currentItem as any).name
-    if (!photoId) return
+    // Use filename as unique identifier (works across all albums)
+    const identifier = Array.isArray((currentItem as any).filename)
+      ? (currentItem as any).filename[0]
+      : (currentItem as any).filename
+    if (!identifier) return
 
     // Copy bookmark URL to clipboard
-    const bookmarkUrl = `${window.location.origin}${pathname}?select=${photoId}`
+    const bookmarkUrl = `${window.location.origin}${pathname}?select=${identifier}`
     navigator.clipboard.writeText(bookmarkUrl)
   }
 
diff --git a/src/hooks/useMapFilter.ts b/src/hooks/useMapFilter.ts
index 227b2dee..bf573aa8 100644
--- a/src/hooks/useMapFilter.ts
+++ b/src/hooks/useMapFilter.ts
@@ -12,6 +12,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
   const [memoryIndex, setMemoryIndexState] = useState(0)
   const resetIndexOnEnableRef = useRef(false) // flag to force index 0 when enabling map filter
   const autoInitialViewRef = useRef(true) // controls useMemory auto mark
+  const [isExpanding, setIsExpanding] = useState(false) // flag to prevent map updates during expand
 
   const setMemoryIndex: Dispatch<SetStateAction<number>> = useCallback((value) => {
     setMemoryIndexState(prev => {
@@ -23,13 +24,22 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
   const [mapFilterEnabled, setMapFilterEnabled] = useState(false)
   const [mapBounds, setMapBounds] = useState<Bounds | null>(null)
   const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [expandCoordinates, setExpandCoordinates] = useState<[number, number] | null>(null)
 
-  const handleClearMapFilter = useCallback(() => {
-    // Delay disabling map filter to prevent map jump during expand
-    setTimeout(() => {
-      setMapFilterEnabled(false)
-      setMapBounds(null)
-    }, 100)
+  const handleClearMapFilter = useCallback((coordinates?: [number, number] | null) => {
+    // Preserve coordinates before clearing filter
+    if (coordinates) {
+      setExpandCoordinates(coordinates)
+    }
+    setIsExpanding(true)
+    setMapFilterEnabled(false)
+    setMapBounds(null)
+  }, [])
+
+  const selectById = useCallback((id: string, isExpand = false) => {
+    // Simply update selectedId for both expand and normal operations
+    // The URL-based handling in each client will position the gallery
+    setSelectedId(prev => (prev === id ? prev : id))
   }, [])
 
   const {
@@ -45,6 +55,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     refImageGallery,
     mapFilterEnabled,
     onClearMapFilter: handleClearMapFilter,
+    selectById,
   })
 
   const handleBoundsChange = useCallback((bounds: Bounds) => {
@@ -72,6 +83,31 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     })
   }, [mapFilterEnabled, mapBounds, filtered])
 
+  // Memoized ID-to-index maps for O(1) lookups (critical for large datasets)
+  const itemsToShowMap = useMemo(() => {
+    const map = new Map<string, number>()
+    itemsToShow.forEach((item: any, idx) => {
+      // Index by ID
+      if (item.id) map.set(item.id, idx)
+      // Also index by filename (globally unique)
+      const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+      if (filename) map.set(filename, idx)
+    })
+    return map
+  }, [itemsToShow])
+
+  const filteredMap = useMemo(() => {
+    const map = new Map<string, number>()
+    filtered.forEach((item: any, idx) => {
+      // Index by ID
+      if (item.id) map.set(item.id, idx)
+      // Also index by filename (globally unique)
+      const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
+      if (filename) map.set(filename, idx)
+    })
+    return map
+  }, [filtered])
+
   // Update displayed items whenever itemsToShow changes
   useEffect(() => {
     setDisplayedItems(itemsToShow)
@@ -115,31 +151,23 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     }
   }, [mapFilterEnabled, itemsToShow, setViewed])
 
-  const selectById = useCallback((id: string) => {
-    setSelectedId(prev => (prev === id ? prev : id))
-    const idx = itemsToShow.findIndex(i => i.id === id)
-    if (idx >= 0) {
+  // Update memoryIndex when selectedId changes
+  useEffect(() => {
+    if (!selectedId) return
+
+    // Use O(1) map lookup
+    const idx = itemsToShowMap.get(selectedId)
+    if (idx !== undefined) {
       setMemoryIndex(idx)
       return
     }
-    const idx2 = filtered.findIndex(i => i.id === id)
-    if (idx2 >= 0) setMemoryIndex(idx2)
-  }, [itemsToShow, filtered, setMemoryIndex])
 
-  useEffect(() => {
-    if (selectedId) {
-      const idx = itemsToShow.findIndex(i => i.id === selectedId)
-      if (idx >= 0) {
-        setMemoryIndex(idx)
-        return
-      }
+    // Fallback to filtered
+    const idx2 = filteredMap.get(selectedId)
+    if (idx2 !== undefined) {
+      setMemoryIndex(idx2)
     }
-    if (itemsToShow.length === 0) {
-      setMemoryIndex(0)
-    } else if (memoryIndex >= itemsToShow.length) {
-      setMemoryIndex(itemsToShow.length - 1)
-    }
-  }, [itemsToShow, selectedId, memoryIndex, setMemoryIndex])
+  }, [itemsToShowMap, filteredMap, selectedId, setMemoryIndex])
 
   useEffect(() => {
     const timeout = setTimeout(() => {
@@ -148,6 +176,18 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     return () => clearTimeout(timeout)
   }, [itemsToShow.length, setVisibleCount])
 
+  // Clear expanding flag after gallery repositions during expand
+  useEffect(() => {
+    if (isExpanding && !mapFilterEnabled) {
+      // Wait for gallery to reposition, then clear flag and coordinates
+      const timeout = setTimeout(() => {
+        setIsExpanding(false)
+        setExpandCoordinates(null)
+      }, 200)
+      return () => clearTimeout(timeout)
+    }
+  }, [mapFilterEnabled, memoryIndex, isExpanding])
+
   return {
     refImageGallery,
     memoryIndex,
@@ -164,5 +204,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     itemsToShow,
     selectedId,
     selectById,
+    isExpanding,
+    expandCoordinates,
   }
 }
diff --git a/src/hooks/usePersonsFilter.tsx b/src/hooks/usePersonsFilter.tsx
index fcfa23a0..6dcff855 100644
--- a/src/hooks/usePersonsFilter.tsx
+++ b/src/hooks/usePersonsFilter.tsx
@@ -41,6 +41,8 @@ export default function usePersonsFilter({
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
+    isExpanding,
+    expandCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
   // Age/person selection state
@@ -219,6 +221,8 @@ export default function usePersonsFilter({
     mapFilterEnabled,
     handleToggleMapFilter,
     handleBoundsChange,
+    isExpanding,
+    expandCoordinates,
     // age/person
     selectedAge,
     setSelectedAge,
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index bdaf7b07..90b4a148 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -22,7 +22,8 @@ interface UseSearchProps<ItemType> {
   indexedKeywords?: IndexedKeywords[];
   refImageGallery?: React.RefObject<any>;
   mapFilterEnabled?: boolean;
-  onClearMapFilter?: () => void;
+  onClearMapFilter?: (coordinates?: [number, number] | null) => void;
+  selectById?: (id: string, isExpand?: boolean) => void;
 }
 
 export default function useSearch<ItemType extends ServerSideItem>({
@@ -32,6 +33,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
   refImageGallery,
   mapFilterEnabled,
   onClearMapFilter,
+  selectById,
 }: UseSearchProps<ItemType>) {
   const searchParams = useSearchParams()
   const router = useRouter()
@@ -180,21 +182,32 @@ export default function useSearch<ItemType extends ServerSideItem>({
     const currentItem = itemsToUse[currentIndex]
     if (!currentItem) return
 
-    const photoId = (currentItem as any).id || (currentItem as any).name // album.name
-    if (!photoId) return
+    // Use filename as unique identifier (works across all albums)
+    const identifier = Array.isArray((currentItem as any).filename)
+      ? (currentItem as any).filename[0]
+      : (currentItem as any).filename
+    if (!identifier) return
+
+    // Extract coordinates from current item
+    const coordinates = (currentItem as any).coordinates as [number, number] | null
+
+    // Set selectedId with expand flag for immediate processing
+    if (selectById) {
+      selectById(identifier, true)
+    }
 
     // Clear search state
     setKeyword('')
     setSelectedOption(null)
     setInputValue('')
 
-    // Clear map filter if enabled
+    // Clear map filter - pass coordinates to preserve map position
     if (mapFilterEnabled && onClearMapFilter) {
-      onClearMapFilter()
+      onClearMapFilter(coordinates)
     }
 
-    // Replace URL with select parameter - this removes keyword and map filter state
-    router.replace(`${pathname}?select=${photoId}`)
+    // Update URL to reflect the selection (use filename for global uniqueness)
+    router.replace(`${pathname}?select=${identifier}`)
   }
 
   const { BookmarkButton } = useBookmark({

From 0e2fa649f3f1bd4451b3272d80a068e15d7b37cd Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 17 Jan 2026 15:02:43 -0800
Subject: [PATCH 20/33] fix(Slippy Map): Tweak CSS

---
 src/components/SlippyMap/index.tsx         | 24 ++++-----------
 src/components/SlippyMap/styles.module.css | 34 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 src/components/SlippyMap/styles.module.css

diff --git a/src/components/SlippyMap/index.tsx b/src/components/SlippyMap/index.tsx
index 67cdcd58..bf323911 100644
--- a/src/components/SlippyMap/index.tsx
+++ b/src/components/SlippyMap/index.tsx
@@ -28,6 +28,7 @@ import {
   unclusterLabelLayer,
   unclusterPointLayer,
 } from './layers'
+import styles from './styles.module.css'
 import { getResolutionForZoom, transformMapOptions, transformSourceOptions } from './options'
 import type { ClusteredMarkers } from '../../lib/generate-clusters'
 
@@ -128,17 +129,6 @@ export default function SlippyMap({
   if (unclusterPointLayer.id) layerIds.push(unclusterPointLayer.id)
   if (unclusterLabelLayer.id) layerIds.push(unclusterLabelLayer.id)
 
-  const toggleStyle: React.CSSProperties = {
-    position: 'absolute',
-    top: 8,
-    right: 8,
-    zIndex: 10,
-    background: 'rgba(255,255,255,0.9)',
-    borderRadius: 6,
-    padding: 6,
-    cursor: 'pointer',
-  }
-
   // Helper to read current bounds immediately
   const readBounds = (): [[number, number],[number, number]] | null => {
     try {
@@ -191,17 +181,15 @@ export default function SlippyMap({
     <>
       <style global jsx>{'.mapboxgl-control-container{display:none;}'}</style>
       <div style={{ position: 'relative', width: '100%', height: '100%', minHeight: 300 }}>
-        <div
-          style={toggleStyle}
-          role="button"
+        <button
+          type="button"
+          className={styles.toggleButton}
           onClick={handleToggleClick}
           aria-pressed={mapFilterEnabled}
           title="Toggle map filter"
         >
-          <span style={{ fontSize: 12, fontWeight: 600 }}>
-            {mapFilterEnabled ? 'Map filter: ON' : 'Map filter: OFF'}
-          </span>
-        </div>
+          {mapFilterEnabled ? 'Map filter: ON' : 'Map filter: OFF'}
+        </button>
         <Map
           {...viewport}
           ref={mapRef}
diff --git a/src/components/SlippyMap/styles.module.css b/src/components/SlippyMap/styles.module.css
new file mode 100644
index 00000000..b595c286
--- /dev/null
+++ b/src/components/SlippyMap/styles.module.css
@@ -0,0 +1,34 @@
+.toggleButton {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  z-index: 10;
+  background-color: rgba(255, 255, 255, 0.9);
+  border-radius: 6px;
+  padding: 6px 10px;
+  cursor: pointer;
+  border: none;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: background-color 0.2s ease, transform 0.1s ease;
+  color: #333; /* Dark text for light background */
+  font-family: inherit;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.toggleButton:hover {
+  background-color: rgba(255, 255, 255, 1);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+.toggleButton:active {
+  transform: translateY(1px);
+}
+
+.toggleButton:focus-visible {
+  outline: 2px solid #007bff;
+  outline-offset: 2px;
+}

From e9ebfa8978ddcf18c5e0272e87b4ccfc9cfb5414 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 17 Jan 2026 15:54:55 -0800
Subject: [PATCH 21/33] feat(View Album > useSearch): Rename Expand button to
 Clear

---
 src/components/Album/AlbumClient.tsx     |   7 +-
 src/components/All/AllClient.tsx         |   8 +-
 src/components/Persons/PersonsClient.tsx |   8 +-
 src/components/SplitViewer/index.tsx     |  26 ++--
 src/hooks/useMapFilter.ts                |  26 ++--
 src/hooks/usePersonsFilter.tsx           |   8 +-
 src/hooks/useSearch.tsx                  | 150 +++--------------------
 src/utils/search.ts                      |  97 +++++++++++++++
 8 files changed, 156 insertions(+), 174 deletions(-)
 create mode 100644 src/utils/search.ts

diff --git a/src/components/Album/AlbumClient.tsx b/src/components/Album/AlbumClient.tsx
index c0df7773..aa1732e4 100644
--- a/src/components/Album/AlbumClient.tsx
+++ b/src/components/Album/AlbumClient.tsx
@@ -31,8 +31,8 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
-    isExpanding,
-    expandCoordinates,
+    isClearing,
+    clearCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
   const searchParams = useSearchParams()
@@ -70,7 +70,8 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
-          isExpanding={isExpanding}
+          isClearing={isClearing}
+          clearCoordinates={clearCoordinates}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/All/AllClient.tsx b/src/components/All/AllClient.tsx
index d3ecb4fa..570616c4 100644
--- a/src/components/All/AllClient.tsx
+++ b/src/components/All/AllClient.tsx
@@ -25,8 +25,8 @@ export default function AllClient({ items, indexedKeywords, clusteredMarkers }:
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
-    isExpanding,
-    expandCoordinates,
+    isClearing,
+    clearCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
   const searchParams = useSearchParams()
@@ -65,8 +65,8 @@ export default function AllClient({ items, indexedKeywords, clusteredMarkers }:
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
-          isExpanding={isExpanding}
-          expandCoordinates={expandCoordinates}
+          isClearing={isClearing}
+          clearCoordinates={clearCoordinates}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/Persons/PersonsClient.tsx b/src/components/Persons/PersonsClient.tsx
index f1c61484..db381747 100644
--- a/src/components/Persons/PersonsClient.tsx
+++ b/src/components/Persons/PersonsClient.tsx
@@ -26,8 +26,8 @@ export default function PersonsClient({
     mapFilterEnabled,
     handleToggleMapFilter,
     handleBoundsChange,
-    isExpanding,
-    expandCoordinates,
+    isClearing,
+    clearCoordinates,
     controls,
     ageFiltered,
     itemsWithCorpus,
@@ -77,8 +77,8 @@ export default function PersonsClient({
           memoryIndex={memoryIndex}
           setMemoryIndex={setMemoryIndex}
           mapFilterEnabled={mapFilterEnabled}
-          isExpanding={isExpanding}
-          expandCoordinates={expandCoordinates}
+          isClearing={isClearing}
+          clearCoordinates={clearCoordinates}
           onToggleMapFilter={handleToggleMapFilter}
           onMapBoundsChange={handleBoundsChange}
         />
diff --git a/src/components/SplitViewer/index.tsx b/src/components/SplitViewer/index.tsx
index 01b80e29..5f5fb64a 100644
--- a/src/components/SplitViewer/index.tsx
+++ b/src/components/SplitViewer/index.tsx
@@ -68,8 +68,8 @@ function SplitViewer({
   memoryIndex,
   setMemoryIndex,
   mapFilterEnabled,
-  isExpanding,
-  expandCoordinates,
+  isClearing,
+  clearCoordinates,
   onToggleMapFilter,
   onMapBoundsChange,
 }: {
@@ -80,8 +80,8 @@ function SplitViewer({
   memoryIndex: number;
   setMemoryIndex: (n: number) => void;
   mapFilterEnabled?: boolean;
-  isExpanding?: boolean;
-  expandCoordinates?: [number, number] | null;
+  isClearing?: boolean;
+  clearCoordinates?: [number, number] | null;
   onToggleMapFilter?: () => void;
   onMapBoundsChange?: (bounds: [[number, number],[number, number]]) => void;
 }) {
@@ -117,28 +117,28 @@ function SplitViewer({
   // Dynamic centroid (always reflects current selected item)
   const dynamicCentroid = (safeIndex === -1 || items.length === 0) ? null : items[safeIndex]
 
-  // Locked centroid used while map filter is ON or during expand
+  // Locked centroid used while map filter is ON or during clear
   const [lockedCentroid, setLockedCentroid] = useState<typeof dynamicCentroid>(dynamicCentroid)
 
-  // Lock centroid when expand starts with preserved coordinates
+  // Lock centroid when clear starts with preserved coordinates
   useEffect(() => {
-    if (isExpanding && expandCoordinates && dynamicCentroid) {
+    if (isClearing && clearCoordinates && dynamicCentroid) {
       setLockedCentroid({
         ...dynamicCentroid,
-        coordinates: expandCoordinates,
+        coordinates: clearCoordinates,
       } as Item)
     }
-  }, [isExpanding, expandCoordinates])
+  }, [isClearing, clearCoordinates])
 
   // Update locked centroid during normal navigation only
   useEffect(() => {
-    if (!mapFilterEnabled && !isExpanding && dynamicCentroid) {
+    if (!mapFilterEnabled && !isClearing && dynamicCentroid) {
       setLockedCentroid(dynamicCentroid)
     }
-  }, [mapFilterEnabled, isExpanding, dynamicCentroid])
+  }, [mapFilterEnabled, isClearing, dynamicCentroid])
 
-  // Always use locked centroid during filter or expand, dynamic otherwise
-  const effectiveCentroid = (mapFilterEnabled || isExpanding) ? lockedCentroid : dynamicCentroid
+  // Always use locked centroid during filter or clear, dynamic otherwise
+  const effectiveCentroid = (mapFilterEnabled || isClearing) ? lockedCentroid : dynamicCentroid
 
   // Only pass startIndex on first mount; afterward let the gallery manage its own state
   const initialIndexRef = useRef(safeIndex)
diff --git a/src/hooks/useMapFilter.ts b/src/hooks/useMapFilter.ts
index bf573aa8..8f7f4438 100644
--- a/src/hooks/useMapFilter.ts
+++ b/src/hooks/useMapFilter.ts
@@ -12,7 +12,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
   const [memoryIndex, setMemoryIndexState] = useState(0)
   const resetIndexOnEnableRef = useRef(false) // flag to force index 0 when enabling map filter
   const autoInitialViewRef = useRef(true) // controls useMemory auto mark
-  const [isExpanding, setIsExpanding] = useState(false) // flag to prevent map updates during expand
+  const [isClearing, setIsClearing] = useState(false) // flag to prevent map updates during clear
 
   const setMemoryIndex: Dispatch<SetStateAction<number>> = useCallback((value) => {
     setMemoryIndexState(prev => {
@@ -24,20 +24,20 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
   const [mapFilterEnabled, setMapFilterEnabled] = useState(false)
   const [mapBounds, setMapBounds] = useState<Bounds | null>(null)
   const [selectedId, setSelectedId] = useState<string | null>(null)
-  const [expandCoordinates, setExpandCoordinates] = useState<[number, number] | null>(null)
+  const [clearCoordinates, setClearCoordinates] = useState<[number, number] | null>(null)
 
   const handleClearMapFilter = useCallback((coordinates?: [number, number] | null) => {
     // Preserve coordinates before clearing filter
     if (coordinates) {
-      setExpandCoordinates(coordinates)
+      setClearCoordinates(coordinates)
     }
-    setIsExpanding(true)
+    setIsClearing(true)
     setMapFilterEnabled(false)
     setMapBounds(null)
   }, [])
 
-  const selectById = useCallback((id: string, isExpand = false) => {
-    // Simply update selectedId for both expand and normal operations
+  const selectById = useCallback((id: string, isClear = false) => {
+    // Simply update selectedId for both clear and normal operations
     // The URL-based handling in each client will position the gallery
     setSelectedId(prev => (prev === id ? prev : id))
   }, [])
@@ -176,17 +176,17 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     return () => clearTimeout(timeout)
   }, [itemsToShow.length, setVisibleCount])
 
-  // Clear expanding flag after gallery repositions during expand
+  // Clear clearing flag after gallery repositions during clear
   useEffect(() => {
-    if (isExpanding && !mapFilterEnabled) {
+    if (isClearing && !mapFilterEnabled) {
       // Wait for gallery to reposition, then clear flag and coordinates
       const timeout = setTimeout(() => {
-        setIsExpanding(false)
-        setExpandCoordinates(null)
+        setIsClearing(false)
+        setClearCoordinates(null)
       }, 200)
       return () => clearTimeout(timeout)
     }
-  }, [mapFilterEnabled, memoryIndex, isExpanding])
+  }, [mapFilterEnabled, memoryIndex, isClearing])
 
   return {
     refImageGallery,
@@ -204,7 +204,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     itemsToShow,
     selectedId,
     selectById,
-    isExpanding,
-    expandCoordinates,
+    isClearing,
+    clearCoordinates,
   }
 }
diff --git a/src/hooks/usePersonsFilter.tsx b/src/hooks/usePersonsFilter.tsx
index 6dcff855..3818c410 100644
--- a/src/hooks/usePersonsFilter.tsx
+++ b/src/hooks/usePersonsFilter.tsx
@@ -41,8 +41,8 @@ export default function usePersonsFilter({
     handleToggleMapFilter,
     handleBoundsChange,
     itemsToShow,
-    isExpanding,
-    expandCoordinates,
+    isClearing,
+    clearCoordinates,
   } = useMapFilter({ items, indexedKeywords })
 
   // Age/person selection state
@@ -221,8 +221,8 @@ export default function usePersonsFilter({
     mapFilterEnabled,
     handleToggleMapFilter,
     handleBoundsChange,
-    isExpanding,
-    expandCoordinates,
+    isClearing,
+    clearCoordinates,
     // age/person
     selectedAge,
     setSelectedAge,
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index 90b4a148..ae411538 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -10,6 +10,7 @@ import {
 import AutoComplete from '../components/ComboBox'
 import { IndexedKeywords } from '../types/common'
 import useBookmark from './useBookmark'
+import { matchCorpus } from '../utils/search'
 import styles from './search.module.css'
 
 interface ServerSideItem {
@@ -23,7 +24,7 @@ interface UseSearchProps<ItemType> {
   refImageGallery?: React.RefObject<any>;
   mapFilterEnabled?: boolean;
   onClearMapFilter?: (coordinates?: [number, number] | null) => void;
-  selectById?: (id: string, isExpand?: boolean) => void;
+  selectById?: (id: string, isClear?: boolean) => void;
 }
 
 export default function useSearch<ItemType extends ServerSideItem>({
@@ -45,7 +46,6 @@ export default function useSearch<ItemType extends ServerSideItem>({
     initialKeyword ? { label: initialKeyword, value: initialKeyword } : null,
   )
   const [inputValue, setInputValue] = useState<string>(initialKeyword)
-  const [filteredItems, setFilteredItems] = useState<ItemType[]>(items)
   const [displayedItems, setDisplayedItems] = useState<ItemType[]>(items)
 
   // Count of currently visible thumbnails (consumer can override this if needed)
@@ -56,126 +56,28 @@ export default function useSearch<ItemType extends ServerSideItem>({
     setVisibleCount((prev) => (prev === count ? prev : count))
   }, [])
 
-  const AND_OPERATOR = '&&'
-  const OR_OPERATOR = '||'
-
-  const normalize = (text: string) =>
-    text
-      .normalize('NFD')
-      .replace(/[\u0300-\u036f]/g, '')
-      .toLowerCase()
-
-  /**
-   * Matches a search keyword against a corpus string using boolean operators.
-   * Supports AND (&&) and OR (||) operators with single-level parentheses.
-   *
-   * Simple searches (words separated by spaces) are treated as implicit AND operations.
-   * For example, "apple banana" matches text containing both "apple" AND "banana".
-   *
-   * Limitation: Nested parentheses are NOT supported. Expressions like `((a || b) && c)`
-   * or `(a && (b || c))` will not be evaluated correctly. Only simple single-level
-   * parentheses work: `(a || b) && c` or `a && (b || c)`.
-   *
-   * @param {string} corpus - The text to search within
-   * @param {string} kword - The search keyword with optional boolean operators (&&, ||) and parentheses
-   * @returns {boolean} True if the keyword matches the corpus
-   *
-   * @example
-   * ```ts
-   * matchCorpus('apple banana', 'apple banana') // true (implicit AND)
-   * matchCorpus('apple banana', 'apple && banana') // true
-   * matchCorpus('orange banana', 'apple || orange') // true
-   * matchCorpus('apple banana', '(apple || orange) && banana') // true
-   * matchCorpus('text', '((a || b) && c)') // NOT SUPPORTED - will not work correctly
-   * ```
-   */
-  const matchCorpus = (corpus: string, kword: string): boolean => {
-    const normalizedCorpus = normalize(corpus)
-    const normalizedKeyword = normalize(kword)
-
-    const evaluateExpression = (expr: string): boolean => {
-      // If there's no AND or OR operator, treat spaces as implicit AND
-      if (!expr.includes(AND_OPERATOR) && !expr.includes(OR_OPERATOR)) {
-        const terms = expr.split(/\s+/).filter(t => t.length > 0)
-        return terms.every((term) => normalizedCorpus.includes(term.trim()))
-      }
-
-      // If there's no AND operator, evaluate as OR expression
-      if (!expr.includes(AND_OPERATOR)) {
-        return expr
-          .split(OR_OPERATOR)
-          .some((term) => normalizedCorpus.includes(term.trim()))
-      }
-
-      // Split by AND carefully, preserving content inside parentheses
-      const andParts: string[] = []
-      let currentPart = ''
-      let depth = 0
-
-      for (let i = 0; i < expr.length; i++) {
-        const char = expr[i]
-        const nextChar = expr[i + 1]
-
-        if (char === '(') depth++
-        if (char === ')') depth--
-
-        // Check for && outside of parentheses
-        if (char === '&' && nextChar === '&' && depth === 0) {
-          andParts.push(currentPart.trim())
-          currentPart = ''
-          i++ // skip the second &
-          continue
-        }
-
-        currentPart += char
-      }
-      if (currentPart.trim()) {
-        andParts.push(currentPart.trim())
-      }
-
-      return andParts.every((part) => {
-        // Check if this part has parentheses
-        const parenMatch = part.match(/^\((.*)\)$/)
-        if (parenMatch) {
-          // Evaluate the OR expression inside parentheses
-          // TODO: This only handles simple OR expressions, not nested AND/OR combinations
-          // For full support, recursively call evaluateExpression(parenMatch[1])
-          const innerExpr = parenMatch[1]
-          return innerExpr
-            .split(OR_OPERATOR)
-            .some((term) => normalizedCorpus.includes(term.trim()))
-        }
-
-        // Regular term - check if corpus contains it
-        return normalizedCorpus.includes(part)
-      })
-    }
-
-    return evaluateExpression(normalizedKeyword)
-  }
-
   const filtered = useMemo(() => {
     if (!keyword) return items
     return items.filter((item) => matchCorpus(item.corpus, keyword))
   }, [items, keyword])
 
-  const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
+  // Adjust visibleCount when filtered items change during render
+  // This avoids a double render caused by useEffect synchronization
+  const [prevFiltered, setPrevFiltered] = useState(filtered)
+  if (filtered !== prevFiltered) {
+    setPrevFiltered(filtered)
+    setVisibleCount(filtered.length)
+  }
+
+  const handleSubmit = useCallback((event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
     const newKeyword = selectedOption?.value ?? ''
     setKeyword(newKeyword)
     setMemoryIndex?.(0)
     router.push(`${pathname}?keyword=${encodeURIComponent(newKeyword)}`)
-  }
-
-  const handleClear = () => {
-    setKeyword('')
-    setSelectedOption(null)
-    setInputValue('')
-    setMemoryIndex?.(0)
-    router.replace(pathname)
-  }
+  }, [selectedOption, setMemoryIndex, router, pathname])
 
-  const handleExpand = () => {
+  const handleClear = useCallback(() => {
     // Get current photo ID from displayed items (respects map filter)
     const currentIndex = refImageGallery?.current?.getCurrentIndex?.() ?? 0
     const itemsToUse = displayedItems || filtered
@@ -191,7 +93,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
     // Extract coordinates from current item
     const coordinates = (currentItem as any).coordinates as [number, number] | null
 
-    // Set selectedId with expand flag for immediate processing
+    // Set selectedId with clear flag for immediate processing
     if (selectById) {
       selectById(identifier, true)
     }
@@ -208,7 +110,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
 
     // Update URL to reflect the selection (use filename for global uniqueness)
     router.replace(`${pathname}?select=${identifier}`)
-  }
+  }, [refImageGallery, displayedItems, filtered, selectById, mapFilterEnabled, onClearMapFilter, router, pathname])
 
   const { BookmarkButton } = useBookmark({
     refImageGallery,
@@ -240,26 +142,15 @@ export default function useSearch<ItemType extends ServerSideItem>({
         >
           Filter
         </Button>
-        {keyword && (
-          <Button
-            type="button"
-            onClick={handleClear}
-            color="primary"
-            variant="soft"
-            title="Clear search"
-          >
-            Clear
-          </Button>
-        )}
         {(mapFilterEnabled || keyword) && (
           <Button
             type="button"
-            onClick={handleExpand}
+            onClick={handleClear}
             color="primary"
             variant="soft"
             title="Clear search and view adjacent photos"
           >
-            Expand
+            Clear
           </Button>
         )}
         <BookmarkButton />
@@ -280,19 +171,12 @@ export default function useSearch<ItemType extends ServerSideItem>({
     }
   }, [searchParams])
 
-  useEffect(() => {
-    setFilteredItems(filtered)
-    // Automatically update visible count when filtered results change
-    setVisibleCount(filtered.length)
-  }, [filtered])
-
   return {
     filtered,
     keyword,
     setKeyword,
     searchBox,
     setVisibleCount: setVisibleCountStable,
-    setFiltered: setFilteredItems,
     setDisplayedItems,
   }
 }
diff --git a/src/utils/search.ts b/src/utils/search.ts
new file mode 100644
index 00000000..35d95cfe
--- /dev/null
+++ b/src/utils/search.ts
@@ -0,0 +1,97 @@
+// Helper functions extracted from the component for performance
+// and to keep the hook logic clean.
+
+const AND_OPERATOR = '&&'
+const OR_OPERATOR = '||'
+
+const normalize = (text: string) =>
+  text
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .toLowerCase()
+
+/**
+ * Matches a search keyword against a corpus string using boolean operators.
+ * Supports AND (&&) and OR (||) operators with single-level parentheses.
+ *
+ * Simple searches (words separated by spaces) are treated as implicit AND operations.
+ * For example, "apple banana" matches text containing both "apple" AND "banana".
+ *
+ * Limitation: Nested parentheses are NOT supported. Expressions like `((a || b) && c)`
+ * or `(a && (b || c))` will not be evaluated correctly. Only simple single-level
+ * parentheses work: `(a || b) && c` or `a && (b || c)`.
+ *
+ * @param {string} corpus - The text to search within
+ * @param {string} kword - The search keyword with optional boolean operators (&&, ||) and parentheses
+ * @returns {boolean} True if the keyword matches the corpus
+ *
+ * @example
+ * ```ts
+ * matchCorpus('apple banana', 'apple banana') // true (implicit AND)
+ * matchCorpus('apple banana', 'apple && banana') // true
+ * matchCorpus('orange banana', 'apple || orange') // true
+ * matchCorpus('apple banana', '(apple || orange) && banana') // true
+ * matchCorpus('text', '((a || b) && c)') // NOT SUPPORTED - will not work correctly
+ * ```
+ */
+export const matchCorpus = (corpus: string, kword: string): boolean => {
+  const normalizedCorpus = normalize(corpus)
+  const normalizedKeyword = normalize(kword)
+
+  const evaluateExpression = (expr: string): boolean => {
+    // If there's no AND or OR operator, treat spaces as implicit AND
+    if (!expr.includes(AND_OPERATOR) && !expr.includes(OR_OPERATOR)) {
+      const terms = expr.split(/\s+/).filter(t => t.length > 0)
+      return terms.every((term) => normalizedCorpus.includes(term.trim()))
+    }
+
+    // If there's no AND operator, evaluate as OR expression
+    if (!expr.includes(AND_OPERATOR)) {
+      return expr
+        .split(OR_OPERATOR)
+        .some((term) => normalizedCorpus.includes(term.trim()))
+    }
+
+    // Split by AND carefully, preserving content inside parentheses
+    const andParts: string[] = []
+    let currentPart = ''
+    let depth = 0
+
+    for (let i = 0; i < expr.length; i++) {
+      const char = expr[i]
+      const nextChar = expr[i + 1]
+
+      if (char === '(') depth++
+      if (char === ')') depth--
+
+      // Check for && outside of parentheses
+      if (char === '&' && nextChar === '&' && depth === 0) {
+        andParts.push(currentPart.trim())
+        currentPart = ''
+        i++ // skip the second &
+        continue
+      }
+
+      currentPart += char
+    }
+    if (currentPart.trim()) {
+      andParts.push(currentPart.trim())
+    }
+
+    return andParts.every((part) => {
+      // Check if this part has parentheses
+      const parenMatch = part.match(/^\((.*)\)$/)
+      if (parenMatch) {
+        const innerExpr = parenMatch[1]
+        return innerExpr
+          .split(OR_OPERATOR)
+          .some((term) => normalizedCorpus.includes(term.trim()))
+      }
+
+      // Regular term - check if corpus contains it
+      return normalizedCorpus.includes(part)
+    })
+  }
+
+  return evaluateExpression(normalizedKeyword)
+}

From 69e7147833569e988de7e8fea380a5dca2ca59eb Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 17 Jan 2026 16:26:53 -0800
Subject: [PATCH 22/33] chore(View All > useSearch): Fix unit tests

---
 app/global.css                                |  4 +++
 src/components/Album/AlbumClient.tsx          |  3 +-
 src/components/All/AllClient.tsx              |  3 +-
 src/components/Persons/PersonsClient.tsx      |  3 +-
 src/components/SlippyMap/index.tsx            |  1 -
 .../__tests__/useMemoryAndMapFilter.test.tsx  |  1 +
 src/hooks/__tests__/useSearch.vitest.tsx      | 29 +++++++++++--------
 src/hooks/useSearch.tsx                       | 12 ++++----
 8 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/app/global.css b/app/global.css
index 5a20ea81..539de7ea 100644
--- a/app/global.css
+++ b/app/global.css
@@ -11,3 +11,7 @@ html {
   --gridPx: 4px;
   --grid2Px: calc(2 * 4px);
 }
+
+.mapboxgl-control-container {
+  display: none;
+}
diff --git a/src/components/Album/AlbumClient.tsx b/src/components/Album/AlbumClient.tsx
index aa1732e4..880659cb 100644
--- a/src/components/Album/AlbumClient.tsx
+++ b/src/components/Album/AlbumClient.tsx
@@ -54,8 +54,9 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
     if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
       refImageGallery.current?.slideToIndex(idx)
       setMemoryIndex(idx)
+      setViewed(idx)
     }
-  }, [selectId, itemsToShow, refImageGallery, setMemoryIndex])
+  }, [selectId, itemsToShow, refImageGallery, setMemoryIndex, setViewed])
 
   return (
     <div>
diff --git a/src/components/All/AllClient.tsx b/src/components/All/AllClient.tsx
index 570616c4..69a31fdd 100644
--- a/src/components/All/AllClient.tsx
+++ b/src/components/All/AllClient.tsx
@@ -49,8 +49,9 @@ export default function AllClient({ items, indexedKeywords, clusteredMarkers }:
     if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
       refImageGallery.current?.slideToIndex(idx)
       setMemoryIndex(idx)
+      setViewed(idx)
     }
-  }, [selectId, itemsToShow, refImageGallery, setMemoryIndex])
+  }, [selectId, itemsToShow, refImageGallery, setMemoryIndex, setViewed])
 
   return (
     <div>
diff --git a/src/components/Persons/PersonsClient.tsx b/src/components/Persons/PersonsClient.tsx
index db381747..e32cb417 100644
--- a/src/components/Persons/PersonsClient.tsx
+++ b/src/components/Persons/PersonsClient.tsx
@@ -55,8 +55,9 @@ export default function PersonsClient({
     if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
       refImageGallery.current?.slideToIndex(idx)
       setMemoryIndex(idx)
+      setViewed(idx)
     }
-  }, [selectId, ageFiltered, refImageGallery, setMemoryIndex])
+  }, [selectId, ageFiltered, refImageGallery, setMemoryIndex, setViewed])
 
   // Replace controls age list if override available
   const finalControls = overrideAgeSummary ?? controls
diff --git a/src/components/SlippyMap/index.tsx b/src/components/SlippyMap/index.tsx
index bf323911..f1626173 100644
--- a/src/components/SlippyMap/index.tsx
+++ b/src/components/SlippyMap/index.tsx
@@ -179,7 +179,6 @@ export default function SlippyMap({
 
   return (
     <>
-      <style global jsx>{'.mapboxgl-control-container{display:none;}'}</style>
       <div style={{ position: 'relative', width: '100%', height: '100%', minHeight: 300 }}>
         <button
           type="button"
diff --git a/src/hooks/__tests__/useMemoryAndMapFilter.test.tsx b/src/hooks/__tests__/useMemoryAndMapFilter.test.tsx
index c5298a43..9803f22a 100644
--- a/src/hooks/__tests__/useMemoryAndMapFilter.test.tsx
+++ b/src/hooks/__tests__/useMemoryAndMapFilter.test.tsx
@@ -10,6 +10,7 @@ jest.mock('../useSearch', () => ({
     keyword: '',
     searchBox: <div data-testid="search-box" />,
     setVisibleCount: jest.fn(),
+    setDisplayedItems: jest.fn(),
   }),
 }))
 
diff --git a/src/hooks/__tests__/useSearch.vitest.tsx b/src/hooks/__tests__/useSearch.vitest.tsx
index ad77e406..3852d979 100644
--- a/src/hooks/__tests__/useSearch.vitest.tsx
+++ b/src/hooks/__tests__/useSearch.vitest.tsx
@@ -269,7 +269,11 @@ describe('Clear button functionality', () => {
 
     vi.mocked(usePathname).mockReturnValue('/search')
 
-    const items = [{ corpus: 'apple' }, { corpus: 'banana' }, { corpus: 'cherry' }]
+    const items = [
+      { corpus: 'apple', filename: 'apple.jpg' },
+      { corpus: 'banana', filename: 'banana.jpg' },
+      { corpus: 'cherry', filename: 'cherry.jpg' },
+    ]
 
     // Use a wrapper component to access the hook
     function TestComponent() {
@@ -283,7 +287,7 @@ describe('Clear button functionality', () => {
     expect(container.textContent).toMatch(/for "apple"/)
 
     // Find the Clear button by title attribute
-    const clearButton = container.querySelector('button[title="Clear search"]') as HTMLButtonElement
+    const clearButton = container.querySelector('button[title="Clear search and view adjacent photos"]') as HTMLButtonElement
 
     // Mock the search params to return empty after clearing
     vi.mocked(useSearchParams).mockReturnValue({
@@ -293,7 +297,7 @@ describe('Clear button functionality', () => {
     fireEvent.click(clearButton)
 
     // Verify router.replace was called
-    expect(mockReplace).toHaveBeenCalledWith('/search')
+    expect(mockReplace).toHaveBeenCalledWith('/search?select=apple.jpg')
 
     // Check that the input field value is cleared
     await waitFor(() => {
@@ -323,21 +327,22 @@ describe('Clear button functionality', () => {
     vi.mocked(usePathname).mockReturnValue('/gallery/photos')
 
     const items = [
-      { corpus: 'apple' },
-      { corpus: 'banana' },
-      { corpus: 'cherry' },
-      { corpus: 'banana split' },
+      { corpus: 'apple', filename: 'apple.jpg' },
+      { corpus: 'banana', filename: 'banana.jpg' },
+      { corpus: 'cherry', filename: 'cherry.jpg' },
+      { corpus: 'banana split', filename: 'banana-split.jpg' },
     ]
 
     // Use a wrapper component to access the hook and set visible count
     function TestComponent() {
       const search = useSearch({ items, indexedKeywords: [] })
 
-      // Simulate setting visible count based on filtered results
-      const { filtered, setVisibleCount } = search
+      // Simulate setting visible count and displayed items based on filtered results
+      const { filtered, setVisibleCount, setDisplayedItems } = search
       React.useEffect(() => {
         setVisibleCount(filtered.length)
-      }, [filtered, setVisibleCount])
+        setDisplayedItems(filtered)
+      }, [filtered, setVisibleCount, setDisplayedItems])
 
       return <div>{search.searchBox}</div>
     }
@@ -353,7 +358,7 @@ describe('Clear button functionality', () => {
     expect(container.textContent).toMatch(/for "ban"/)
 
     // Find the Clear button
-    const clearButton = container.querySelector('button[title="Clear search"]') as HTMLButtonElement
+    const clearButton = container.querySelector('button[title="Clear search and view adjacent photos"]') as HTMLButtonElement
 
     // Mock the search params to return empty after clearing
     vi.mocked(useSearchParams).mockReturnValue({
@@ -363,7 +368,7 @@ describe('Clear button functionality', () => {
     fireEvent.click(clearButton)
 
     // Verify URL was cleared (router.replace called with path only, no keyword)
-    expect(mockReplace).toHaveBeenCalledWith('/gallery/photos')
+    expect(mockReplace).toHaveBeenCalledWith('/gallery/photos?select=banana.jpg')
 
     // Re-render to reflect the cleared state
     rerender(<TestComponent />)
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index ae411538..ce940678 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -48,19 +48,19 @@ export default function useSearch<ItemType extends ServerSideItem>({
   const [inputValue, setInputValue] = useState<string>(initialKeyword)
   const [displayedItems, setDisplayedItems] = useState<ItemType[]>(items)
 
+  const filtered = useMemo(() => {
+    if (!keyword) return items
+    return items.filter((item) => matchCorpus(item.corpus, keyword))
+  }, [items, keyword])
+
   // Count of currently visible thumbnails (consumer can override this if needed)
-  const [visibleCount, setVisibleCount] = useState<number>(items.length)
+  const [visibleCount, setVisibleCount] = useState<number>(filtered.length)
 
   // Make setVisibleCount stable to prevent useEffect loops
   const setVisibleCountStable = useCallback((count: number) => {
     setVisibleCount((prev) => (prev === count ? prev : count))
   }, [])
 
-  const filtered = useMemo(() => {
-    if (!keyword) return items
-    return items.filter((item) => matchCorpus(item.corpus, keyword))
-  }, [items, keyword])
-
   // Adjust visibleCount when filtered items change during render
   // This avoids a double render caused by useEffect synchronization
   const [prevFiltered, setPrevFiltered] = useState(filtered)

From 0afc0521bab6b053da81a0a4cd131beca5a67263 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sun, 18 Jan 2026 20:45:47 -0800
Subject: [PATCH 23/33] chore(View Album > useSearch): Bookmark anchors you in
 your current filtered view, while Clear anchors you to the photo while
 blowing away the filters.

---
 src/components/Album/AlbumClient.tsx     | 13 ++++--------
 src/components/All/AllClient.tsx         | 27 ++++++++++++------------
 src/components/All/Items.tsx             |  2 +-
 src/components/Persons/PersonsClient.tsx | 25 +++++++++++-----------
 src/hooks/useBookmark.tsx                | 20 ++++++++++++++++--
 src/hooks/useMapFilter.ts                |  1 +
 src/hooks/useSearch.tsx                  |  4 ++++
 7 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/components/Album/AlbumClient.tsx b/src/components/Album/AlbumClient.tsx
index 880659cb..dd3d5596 100644
--- a/src/components/Album/AlbumClient.tsx
+++ b/src/components/Album/AlbumClient.tsx
@@ -40,15 +40,10 @@ function AlbumClient({ items = [], meta, indexedKeywords, clusteredMarkers }: Al
 
   useEffect(() => {
     if (!selectId || itemsToShow.length === 0) return
-    let idx = itemsToShow.findIndex(i => i.id === selectId)
-
-    // Fallback: try matching by filename (for All view where IDs may not be unique)
-    if (idx < 0) {
-      idx = itemsToShow.findIndex(i => {
-        const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
-        return filename === selectId
-      })
-    }
+    const idx = itemsToShow.findIndex(i => {
+      const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+      return filename === selectId
+    })
 
     // Only slide if we found the item (idx >= 0) AND the gallery isn't already at that index
     if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
diff --git a/src/components/All/AllClient.tsx b/src/components/All/AllClient.tsx
index 69a31fdd..8670294e 100644
--- a/src/components/All/AllClient.tsx
+++ b/src/components/All/AllClient.tsx
@@ -35,21 +35,22 @@ export default function AllClient({ items, indexedKeywords, clusteredMarkers }:
   // Handle URL ?select= parameter
   useEffect(() => {
     if (!selectId || itemsToShow.length === 0) return
-    let idx = itemsToShow.findIndex(i => i.id === selectId)
 
-    // Fallback: try matching by filename
-    if (idx < 0) {
-      idx = itemsToShow.findIndex(i => {
-        const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
-        return filename === selectId
-      })
-    }
+    const idx = itemsToShow.findIndex(i => {
+      const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+      return filename === selectId
+    })
 
-    // Only slide if found and not already at that index
-    if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
-      refImageGallery.current?.slideToIndex(idx)
-      setMemoryIndex(idx)
-      setViewed(idx)
+    if (idx >= 0) {
+      // Use timeout to allow gallery to process items update (which might reset index)
+      // before enforcing the selected index
+      setTimeout(() => {
+        if (refImageGallery.current?.getCurrentIndex?.() !== idx) {
+          refImageGallery.current?.slideToIndex(idx)
+          setMemoryIndex(idx)
+          setViewed(idx)
+        }
+      }, 0)
     }
   }, [selectId, itemsToShow, refImageGallery, setMemoryIndex, setViewed])
 
diff --git a/src/components/All/Items.tsx b/src/components/All/Items.tsx
index cb04c33c..8fb026d9 100644
--- a/src/components/All/Items.tsx
+++ b/src/components/All/Items.tsx
@@ -24,7 +24,7 @@ function All({ items, keyword, refImageGallery }: InputProps) {
       {items.map((item, index) => (
         <li key={item.filename.toString()}>
           <b className={styles.albumName}>{item.album}</b>
-          <Link href={`/${item.gallery}/${item.album}?select=${item.id}`} title={item.corpus}>
+          <Link href={`/${item.gallery}/${item.album}?select=${Array.isArray(item.filename) ? item.filename[0] : item.filename}`} title={item.corpus}>
             {!showThumbnail(keyword) && item.caption}
             {showThumbnail(keyword) && <Img src={item.thumbPath} alt={item.caption} title={item.corpus} width={width} height={height} />}
           </Link>
diff --git a/src/components/Persons/PersonsClient.tsx b/src/components/Persons/PersonsClient.tsx
index e32cb417..f58cf65b 100644
--- a/src/components/Persons/PersonsClient.tsx
+++ b/src/components/Persons/PersonsClient.tsx
@@ -41,21 +41,20 @@ export default function PersonsClient({
   // Handle URL ?select= parameter
   useEffect(() => {
     if (!selectId || ageFiltered.length === 0) return
-    let idx = ageFiltered.findIndex(i => i.id === selectId)
 
-    // Fallback: try matching by filename
-    if (idx < 0) {
-      idx = ageFiltered.findIndex(i => {
-        const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
-        return filename === selectId
-      })
-    }
+    const idx = ageFiltered.findIndex(i => {
+      const filename = Array.isArray(i.filename) ? i.filename[0] : i.filename
+      return filename === selectId
+    })
 
-    // Only slide if found and not already at that index
-    if (idx >= 0 && refImageGallery.current?.getCurrentIndex?.() !== idx) {
-      refImageGallery.current?.slideToIndex(idx)
-      setMemoryIndex(idx)
-      setViewed(idx)
+    if (idx >= 0) {
+      setTimeout(() => {
+        if (refImageGallery.current?.getCurrentIndex?.() !== idx) {
+          refImageGallery.current?.slideToIndex(idx)
+          setMemoryIndex(idx)
+          setViewed(idx)
+        }
+      }, 0)
     }
   }, [selectId, ageFiltered, refImageGallery, setMemoryIndex, setViewed])
 
diff --git a/src/hooks/useBookmark.tsx b/src/hooks/useBookmark.tsx
index 5516c3c8..80861b87 100644
--- a/src/hooks/useBookmark.tsx
+++ b/src/hooks/useBookmark.tsx
@@ -1,23 +1,31 @@
 'use client'
 
 import { Button } from '@mui/joy'
+import { useRouter } from 'next/navigation'
 import type { RefObject } from 'react'
 
 interface UseBookmarkProps<ItemType> {
   refImageGallery?: RefObject<any>
   displayedItems: ItemType[]
   pathname: string
+  currentIndex?: number
+  selectById?: (id: string) => void
 }
 
 export default function useBookmark<ItemType>({
   refImageGallery,
   displayedItems,
   pathname,
+  currentIndex,
+  selectById,
 }: UseBookmarkProps<ItemType>) {
+  const router = useRouter()
+
   const handleBookmark = () => {
     // Get current photo ID from displayed items (respects map filter)
-    const currentIndex = refImageGallery?.current?.getCurrentIndex?.() ?? 0
-    const currentItem = displayedItems[currentIndex]
+    const galleryIndex = refImageGallery?.current?.getCurrentIndex?.()
+    const indexToUse = typeof galleryIndex === 'number' ? galleryIndex : (currentIndex ?? 0)
+    const currentItem = displayedItems[indexToUse]
     if (!currentItem) return
 
     // Use filename as unique identifier (works across all albums)
@@ -26,9 +34,17 @@ export default function useBookmark<ItemType>({
       : (currentItem as any).filename
     if (!identifier) return
 
+    // Notify parent to track selection (updates memoryIndex to match ID)
+    if (selectById) {
+      selectById(identifier)
+    }
+
     // Copy bookmark URL to clipboard
     const bookmarkUrl = `${window.location.origin}${pathname}?select=${identifier}`
     navigator.clipboard.writeText(bookmarkUrl)
+
+    // Update URL to reflect the selection
+    router.replace(`${pathname}?select=${identifier}`, { scroll: false })
   }
 
   const BookmarkButton = () => (
diff --git a/src/hooks/useMapFilter.ts b/src/hooks/useMapFilter.ts
index 8f7f4438..6cf9366f 100644
--- a/src/hooks/useMapFilter.ts
+++ b/src/hooks/useMapFilter.ts
@@ -50,6 +50,7 @@ export default function useMapFilter({ items, indexedKeywords }: All.ItemData) {
     setDisplayedItems,
   } = useSearch({
     items,
+    memoryIndex,
     setMemoryIndex,
     indexedKeywords,
     refImageGallery,
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index ce940678..40827155 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -19,6 +19,7 @@ interface ServerSideItem {
 
 interface UseSearchProps<ItemType> {
   items: ItemType[];
+  memoryIndex?: number;
   setMemoryIndex?: Dispatch<SetStateAction<number>>;
   indexedKeywords?: IndexedKeywords[];
   refImageGallery?: React.RefObject<any>;
@@ -29,6 +30,7 @@ interface UseSearchProps<ItemType> {
 
 export default function useSearch<ItemType extends ServerSideItem>({
   items,
+  memoryIndex,
   setMemoryIndex,
   indexedKeywords = [],
   refImageGallery,
@@ -116,6 +118,8 @@ export default function useSearch<ItemType extends ServerSideItem>({
     refImageGallery,
     displayedItems: displayedItems || filtered,
     pathname,
+    currentIndex: memoryIndex,
+    selectById,
   })
 
   const keywordResultLabel = keyword ? <> for &quot;{keyword}&quot;</> : null

From 8295287e2d6dfd5ca403d57fdc6e2e7636a35f09 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Thu, 22 Jan 2026 20:35:51 -0800
Subject: [PATCH 24/33] fix(npm run build): Remove Node.js from client
 component

---
 src/lib/paths.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/lib/paths.ts b/src/lib/paths.ts
index 55e27236..ab634bfe 100644
--- a/src/lib/paths.ts
+++ b/src/lib/paths.ts
@@ -1,13 +1,14 @@
-import path from 'node:path'
-
 import type { Gallery, Item, XmlItem } from '../types/common'
 
 const type = (filepath: string): string => {
-  if (filepath.lastIndexOf('.') === 0) {
-    return path.parse(filepath).name.substring(1)
+  const lastDot = filepath.lastIndexOf('.')
+  if (lastDot === 0) {
+    return filepath.substring(1)
   }
-
-  return path.extname(filepath).substring(1)
+  if (lastDot === -1) {
+    return ''
+  }
+  return filepath.substring(lastDot + 1)
 }
 
 const filenameAsJpg = (filename: Item['filename'][0]) => {

From c3f37202bf7b99d71a4a04ff68fb57a45c44c7e3 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Fri, 23 Jan 2026 20:23:36 -0800
Subject: [PATCH 25/33] feat(Admin > Edit Album): Edit multiple photos

---
 .../AdminAlbum/AdminAlbumClient.tsx           | 93 ++++++++++++++++++-
 src/components/AdminAlbum/Thumbs.tsx          | 14 ++-
 src/components/ThumbImg/index.tsx             |  4 +-
 3 files changed, 100 insertions(+), 11 deletions(-)

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index 3e30d036..d6f92852 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -29,14 +29,49 @@ export default function AdminAlbumClient(
   const [album, setAlbum] = useState<GalleryAlbum | null>(null)
   const [item, setItem] = useState<XmlItemState>(null)
   const [currentIndex, setCurrentIndex] = useState<number>(-1)
+  const [selectedIndices, setSelectedIndices] = useState<Set<number>>(new Set())
   const [searchQuery, setSearchQuery] = useState<string>('')
   const [searchResults, setSearchResults] = useState<SearchResult[]>([])
   const [isSearching, setIsSearching] = useState(false)
-  const { EditCountPill, editedItems, handleItemUpdate, handleXmlGenerated, getItemWithEdits, clearEdits, applyEditsToItems } = useEditCountPill()
+  const { EditCountPill, editedItems, handleItemUpdate: handleItemUpdateOriginal, handleXmlGenerated, getItemWithEdits, clearEdits, applyEditsToItems } = useEditCountPill()
   const { data, error, mutate } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${currentGallery}/${album?.name}` : null, fetcher)
 
   const items = data?.album.item ? (Array.isArray(data.album.item) ? data.album.item : [data.album.item]) : []
 
+  const countFields = (item: RawXmlItem | null) => {
+    if (!item) return 0
+    let count = 0
+    for (const [key, value] of Object.entries(item)) {
+      if (key !== '$' && key !== 'filename' && value) {
+        count++
+      }
+    }
+    return count
+  }
+
+  const handleItemUpdateWrapper = (updatedItem: RawXmlItem) => {
+    // If multiple items are selected, apply the update to all of them
+    // preserving their specific ID and filename
+    if (selectedIndices.size > 0) {
+      selectedIndices.forEach(index => {
+        const targetItem = items[index]
+        if (!targetItem) return
+
+        // Create a new item that is a copy of the updated item
+        // but restores the target's ID and filename
+        const newItem = {
+          ...updatedItem,
+          $: targetItem.$,
+          filename: targetItem.filename
+        }
+        
+        handleItemUpdateOriginal(newItem)
+      })
+    } else {
+      handleItemUpdateOriginal(updatedItem)
+    }
+  }
+
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       // Don't trigger if user is typing in an input/textarea
@@ -61,6 +96,8 @@ export default function AdminAlbumClient(
         e.preventDefault()
         const newIndex = Math.max(0, Math.min(items.length - 1, currentIndex + delta))
         if (newIndex !== currentIndex) {
+          // Reset selection on navigation
+          setSelectedIndices(new Set([newIndex]))
           setCurrentIndex(newIndex)
           setItem(items[newIndex])
         }
@@ -71,9 +108,47 @@ export default function AdminAlbumClient(
     return () => window.removeEventListener('keydown', handleKeyDown)
   }, [currentIndex, items])
 
-  const handleItemSelect = (selectedItem: RawXmlItem, index: number) => {
-    setItem(selectedItem)
+  const handleItemSelect = (selectedItem: RawXmlItem, index: number, isShift: boolean = false) => {
+    let newSelectedIndices = new Set<number>()
+
+    if (isShift && currentIndex !== -1) {
+      // Range selection
+      const start = Math.min(currentIndex, index)
+      const end = Math.max(currentIndex, index)
+      // Keep existing selection if needed? Standard behavior usually anchors to last click.
+      // But let's assume standard shift-click behavior: select range from anchor to current.
+      // We don't track anchor separately loop, so we assume currentIndex is anchor.
+      
+      // If we want to ADD to selection with CMD/Ctrl, we'd need that too, but user asked for Shift.
+      // For simplicity, just range select.
+      for (let i = start; i <= end; i++) {
+        newSelectedIndices.add(i)
+      }
+    } else {
+      newSelectedIndices.add(index)
+    }
+
+    setSelectedIndices(newSelectedIndices)
     setCurrentIndex(index)
+
+    // Find the item with most fields among selected
+    let bestItem = items[index]
+    let maxFields = -1
+
+    newSelectedIndices.forEach(idx => {
+      const candidate = items[idx]
+      // Use the edited version if available to count fields? 
+      // User said "Select the photo's XML value which has the most fields"
+      // Likely refers to current state.
+      const itemToCheck = getItemWithEdits(candidate) || candidate
+      const fields = countFields(itemToCheck)
+      if (fields > maxFields) {
+        maxFields = fields
+        bestItem = candidate
+      }
+    })
+
+    setItem(bestItem)
   }
 
   const handleAlbumChange = (
@@ -87,6 +162,7 @@ export default function AdminAlbumClient(
       clearEdits()
       setCurrentIndex(-1)
       setItem(null)
+      setSelectedIndices(new Set())
     }
   }
 
@@ -101,6 +177,7 @@ export default function AdminAlbumClient(
       clearEdits()
       setItem(null)
       setCurrentIndex(-1)
+      setSelectedIndices(new Set())
     }
   }
 
@@ -159,7 +236,7 @@ export default function AdminAlbumClient(
           xmlAlbum={data}
           gallery={currentGallery}
           item={getItemWithEdits(item)}
-          onItemUpdate={handleItemUpdate}
+          onItemUpdate={handleItemUpdateWrapper}
           onXmlGenerated={handleXmlGenerated}
           editedItems={editedItems}
           applyEditsToItems={applyEditsToItems}
@@ -221,7 +298,13 @@ export default function AdminAlbumClient(
         </Stack>
         {error && <div>{JSON.stringify(error)}</div>}
         {!error && data ? (
-          <Thumbs xmlAlbum={data} gallery={currentGallery} setItem={handleItemSelect} currentIndex={currentIndex} />
+          <Thumbs
+            xmlAlbum={data}
+            gallery={currentGallery}
+            setItem={handleItemSelect}
+            currentIndex={currentIndex}
+            selectedIndices={selectedIndices}
+          />
         ) : (
           <div>Select an album</div>
         )}
diff --git a/src/components/AdminAlbum/Thumbs.tsx b/src/components/AdminAlbum/Thumbs.tsx
index 94302d1c..2df94308 100644
--- a/src/components/AdminAlbum/Thumbs.tsx
+++ b/src/components/AdminAlbum/Thumbs.tsx
@@ -4,8 +4,14 @@ import styles from '../Album/styles.module.css'
 import ThumbImg from '../ThumbImg'
 
 export default function AdminAlbumThumbs(
-  { xmlAlbum, gallery, setItem, currentIndex }:
-  { xmlAlbum: RawXmlAlbum, gallery: Gallery, setItem: (item: RawXmlItem, index: number) => void, currentIndex: number },
+  { xmlAlbum, gallery, setItem, currentIndex, selectedIndices }:
+  { 
+    xmlAlbum: RawXmlAlbum, 
+    gallery: Gallery, 
+    setItem: (item: RawXmlItem, index: number, isShift?: boolean) => void, 
+    currentIndex: number,
+    selectedIndices?: Set<number>
+  },
 ) {
   const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
 
@@ -19,10 +25,10 @@ export default function AdminAlbumThumbs(
         {items.map((item, index) => {
           const filename = Array.isArray(item.filename) ? item.filename[0] : item.filename
           const caption = item.thumb_caption || filename
-          const isSelected = index === currentIndex
+          const isSelected = selectedIndices ? selectedIndices.has(index) : index === currentIndex
           return (
             <ThumbImg
-              onClick={() => setItem(item, index)}
+              onClick={(e) => setItem(item, index, e.shiftKey)}
               src={thumbPath(item.filename, gallery)}
               caption={caption}
               key={filename}
diff --git a/src/components/ThumbImg/index.tsx b/src/components/ThumbImg/index.tsx
index 26c7d0a8..a382391d 100644
--- a/src/components/ThumbImg/index.tsx
+++ b/src/components/ThumbImg/index.tsx
@@ -19,7 +19,7 @@ function ThumbImg({
   id,
   viewed: globalViewed = false,
 }: {
-  onClick?: () => void;
+  onClick?: (event: MouseEvent<HTMLAnchorElement | HTMLUListElement>) => void;
   caption: string;
   href?: string;
   src: string;
@@ -36,7 +36,7 @@ function ThumbImg({
   const handleClick = (event: MouseEvent<HTMLAnchorElement | HTMLUListElement>) => {
     event.preventDefault()
     if (!viewed) setViewed(true)
-    onClick?.()
+    onClick?.(event)
   }
 
   const { width, height } = config.resizeDimensions.thumb

From e03fa23096cccff09af76543d1257a9a8689440a Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Mon, 26 Jan 2026 17:03:47 -0800
Subject: [PATCH 26/33] feat(Admin > Edit Album): Change layout to vertical
 thumbs with sticky Fields

---
 .../AdminAlbum/AdminAlbumClient.tsx           | 174 ++++----
 src/components/AdminAlbum/Fields.tsx          | 404 +++++++++---------
 src/components/AdminAlbum/Photo.tsx           |  10 +-
 src/components/AdminAlbum/Thumbs.tsx          |   8 +-
 src/hooks/__tests__/useSearch.vitest.tsx      |   2 +-
 5 files changed, 305 insertions(+), 293 deletions(-)

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index d6f92852..31811083 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -33,7 +33,15 @@ export default function AdminAlbumClient(
   const [searchQuery, setSearchQuery] = useState<string>('')
   const [searchResults, setSearchResults] = useState<SearchResult[]>([])
   const [isSearching, setIsSearching] = useState(false)
-  const { EditCountPill, editedItems, handleItemUpdate: handleItemUpdateOriginal, handleXmlGenerated, getItemWithEdits, clearEdits, applyEditsToItems } = useEditCountPill()
+  const {
+    EditCountPill,
+    editedItems,
+    handleItemUpdate: handleItemUpdateOriginal,
+    handleXmlGenerated,
+    getItemWithEdits,
+    clearEdits,
+    applyEditsToItems,
+  } = useEditCountPill()
   const { data, error, mutate } = useSWR<RawXmlAlbum>(album?.name ? `/api/admin/xml/${currentGallery}/${album?.name}` : null, fetcher)
 
   const items = data?.album.item ? (Array.isArray(data.album.item) ? data.album.item : [data.album.item]) : []
@@ -62,9 +70,9 @@ export default function AdminAlbumClient(
         const newItem = {
           ...updatedItem,
           $: targetItem.$,
-          filename: targetItem.filename
+          filename: targetItem.filename,
         }
-        
+
         handleItemUpdateOriginal(newItem)
       })
     } else {
@@ -118,7 +126,7 @@ export default function AdminAlbumClient(
       // Keep existing selection if needed? Standard behavior usually anchors to last click.
       // But let's assume standard shift-click behavior: select range from anchor to current.
       // We don't track anchor separately loop, so we assume currentIndex is anchor.
-      
+
       // If we want to ADD to selection with CMD/Ctrl, we'd need that too, but user asked for Shift.
       // For simplicity, just range select.
       for (let i = start; i <= end; i++) {
@@ -137,7 +145,7 @@ export default function AdminAlbumClient(
 
     newSelectedIndices.forEach(idx => {
       const candidate = items[idx]
-      // Use the edited version if available to count fields? 
+      // Use the edited version if available to count fields?
       // User said "Select the photo's XML value which has the most fields"
       // Likely refers to current state.
       const itemToCheck = getItemWithEdits(candidate) || candidate
@@ -231,83 +239,91 @@ export default function AdminAlbumClient(
 
   return (
     <form>
-        <EditCountPill />
-        {item && <Fields
-          xmlAlbum={data}
-          gallery={currentGallery}
-          item={getItemWithEdits(item)}
-          onItemUpdate={handleItemUpdateWrapper}
-          onXmlGenerated={handleXmlGenerated}
-          editedItems={editedItems}
-          applyEditsToItems={applyEditsToItems}
+      <EditCountPill />
+      <Stack
+        direction="row"
+        spacing={2}
+        sx={{
+          alignItems: 'center',
+          marginBottom: 2,
+        }}
+      >
+        <label htmlFor="search-filename">Search Filename</label>
+        <Input
+          id="search-filename"
+          placeholder="Enter filename..."
+          value={searchQuery}
+          onChange={(e) => setSearchQuery(e.target.value)}
+          onKeyDown={handleSearchKeyDown}
+          sx={{ flexGrow: 1 }}
+        />
+        <Button onClick={handleSearch} disabled={isSearching} variant="solid">
+          {isSearching ? 'Searching...' : 'Search'}
+        </Button>
+
+        <label htmlFor="select-gallery-label" id="select-gallery">Gallery</label>
+        <Select
+          value={currentGallery}
+          onChange={handleGalleryChange}
+          slotProps={{
+            button: {
+              id: 'select-gallery-label',
+              'aria-labelledby': 'select-gallery select-gallery-label',
+            },
+          }}
+          variant='solid'
         >
-          <Photo item={item} gallery={currentGallery} />
-        </Fields>}
-        <Stack
-          direction="row"
-          spacing={2}
-          sx={{
-            alignItems: 'center',
-            marginBottom: 2,
+          <Option value="">Select a Gallery</Option>
+          {galleries.map(gallery => <Option key={gallery} value={gallery}>{gallery}</Option>)}
+        </Select>
+
+        <label htmlFor="select-album-label" id="select-album">Album</label>
+        <Select
+          value={album?.name ?? ''}
+          onChange={handleAlbumChange}
+          slotProps={{
+            button: {
+              id: 'select-album-label',
+              'aria-labelledby': 'select-album select-album-label',
+            },
           }}
+          variant='solid'
         >
-          <label htmlFor="search-filename">Search Filename</label>
-          <Input
-            id="search-filename"
-            placeholder="Enter filename..."
-            value={searchQuery}
-            onChange={(e) => setSearchQuery(e.target.value)}
-            onKeyDown={handleSearchKeyDown}
-            sx={{ flexGrow: 1 }}
-          />
-          <Button onClick={handleSearch} disabled={isSearching} variant="solid">
-            {isSearching ? 'Searching...' : 'Search'}
-          </Button>
-
-          <label htmlFor="select-gallery-label" id="select-gallery">Gallery</label>
-          <Select
-            value={currentGallery}
-            onChange={handleGalleryChange}
-            slotProps={{
-              button: {
-                id: 'select-gallery-label',
-                'aria-labelledby': 'select-gallery select-gallery-label',
-              },
-            }}
-            variant='solid'
-          >
-            <Option value="">Select a Gallery</Option>
-            {galleries.map(gallery => <Option key={gallery} value={gallery}>{gallery}</Option>)}
-          </Select>
-
-          <label htmlFor="select-album-label" id="select-album">Album</label>
-          <Select
-            value={album?.name ?? ''}
-            onChange={handleAlbumChange}
-            slotProps={{
-              button: {
-                id: 'select-album-label',
-                'aria-labelledby': 'select-album select-album-label',
-              },
-            }}
-            variant='solid'
-          >
-            <Option value="">Select a Album</Option>
-            {galleryAlbum[currentGallery].albums.map(album => <Option key={album.name} value={album.name}>{album.name}</Option>)}
-          </Select>
+          <Option value="">Select a Album</Option>
+          {galleryAlbum[currentGallery].albums.map(album => <Option key={album.name} value={album.name}>{album.name}</Option>)}
+        </Select>
+      </Stack>
+      {error && <div>{JSON.stringify(error)}</div>}
+      {!error && data ? (
+        <Stack direction="row" spacing={2} sx={{ alignItems: 'flex-start' }}>
+          <Stack sx={{ flex: 1, minWidth: 0 }}>
+            <Thumbs
+              xmlAlbum={data}
+              gallery={currentGallery}
+              setItem={handleItemSelect}
+              currentIndex={currentIndex}
+              selectedIndices={selectedIndices}
+            />
+          </Stack>
+          {item && (
+            <Stack sx={{ position: 'sticky', top: 16, alignSelf: 'flex-start' }}>
+              <Fields
+                xmlAlbum={data}
+                gallery={currentGallery}
+                item={getItemWithEdits(item)}
+                onItemUpdate={handleItemUpdateWrapper}
+                onXmlGenerated={handleXmlGenerated}
+                editedItems={editedItems}
+                applyEditsToItems={applyEditsToItems}
+              >
+                <Photo item={item} gallery={currentGallery} size="small" />
+              </Fields>
+            </Stack>
+          )}
         </Stack>
-        {error && <div>{JSON.stringify(error)}</div>}
-        {!error && data ? (
-          <Thumbs
-            xmlAlbum={data}
-            gallery={currentGallery}
-            setItem={handleItemSelect}
-            currentIndex={currentIndex}
-            selectedIndices={selectedIndices}
-          />
-        ) : (
-          <div>Select an album</div>
-        )}
-      </form>
+      ) : (
+        <div>Select an album</div>
+      )}
+    </form>
   )
 }
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 7783d61d..0c1cfc86 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -119,232 +119,224 @@ export default function Fields(
 
   return (
     <>
-      <Stack
-        direction="row"
-        spacing={2}
-        sx={{
-          alignItems: 'flex-start',
-        }}
-      >
-        {children}
-        <Stack direction="column" spacing={2} sx={{ width: '35rem', flexShrink: 0 }}>
-          <Input
-            value={filename}
-            readOnly
-            placeholder="Filename"
-            title="Filename (read-only)"
-          />
-          <Input
-            value={editedItem?.photo_city ?? ''}
-            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_city: e.target.value } : null)}
-            placeholder="City"
-            title="City (photo_city)"
-          />
-          <Input
-            value={editedItem?.photo_loc ?? ''}
-            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_loc: e.target.value } : null)}
-            placeholder="Location"
-            title="Location (photo_loc)"
-          />
-          <Textarea
-            value={editedItem?.photo_desc ?? ''}
-            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_desc: e.target.value } : null)}
-            placeholder="Description"
-            title="Description (photo_desc)"
-            minRows={2}
-          />
-          <Input
-            value={editedItem?.thumb_caption ?? ''}
-            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, thumb_caption: e.target.value } : null)}
-            placeholder="Caption"
-            title="Caption (thumb_caption)"
-          />
+      <Stack direction="column" spacing={2} sx={{ width: '35rem', flexShrink: 0 }}>
+        <Input
+          value={filename}
+          readOnly
+          placeholder="Filename"
+          title="Filename (read-only)"
+        />
+        <Input
+          value={editedItem?.photo_city ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_city: e.target.value } : null)}
+          placeholder="City"
+          title="City (photo_city)"
+        />
+        <Input
+          value={editedItem?.photo_loc ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_loc: e.target.value } : null)}
+          placeholder="Location"
+          title="Location (photo_loc)"
+        />
+        <Textarea
+          value={editedItem?.photo_desc ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_desc: e.target.value } : null)}
+          placeholder="Description"
+          title="Description (photo_desc)"
+          minRows={2}
+        />
+        <Input
+          value={editedItem?.thumb_caption ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, thumb_caption: e.target.value } : null)}
+          placeholder="Caption"
+          title="Caption (thumb_caption)"
+        />
+        <Input
+          value={editedItem?.search ?? ''}
+          onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, search: e.target.value } : null)}
+          placeholder="Search keywords"
+          title="Search keywords (comma-separated)"
+        />
+        <ComboBox
+          className="keyword-autocomplete"
+          options={allKeywords}
+          value={null}
+          inputValue={autocompleteValue}
+          onInputChange={(newValue) => {
+            setAutocompleteValue(newValue)
+          }}
+          onChange={({ value }) => {
+            // Append the selected keyword to the existing search field
+            updateItem((prev: RawXmlItem | null) => {
+              if (!prev) return null
+              const currentSearch = prev.search ?? ''
+              const separator = currentSearch && !currentSearch.endsWith(', ') ? ', ' : ''
+              return { ...prev, search: currentSearch + separator + value }
+            })
+            // Clear the autocomplete input
+            setAutocompleteValue('')
+          }}
+        />
+        <Stack direction="row" spacing={1}>
           <Input
-            value={editedItem?.search ?? ''}
-            onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, search: e.target.value } : null)}
-            placeholder="Search keywords"
-            title="Search keywords (comma-separated)"
-          />
-          <ComboBox
-            className="keyword-autocomplete"
-            options={allKeywords}
-            value={null}
-            inputValue={autocompleteValue}
-            onInputChange={(newValue) => {
-              setAutocompleteValue(newValue)
-            }}
-            onChange={({ value }) => {
-              // Append the selected keyword to the existing search field
-              updateItem((prev: RawXmlItem | null) => {
-                if (!prev) return null
-                const currentSearch = prev.search ?? ''
-                const separator = currentSearch && !currentSearch.endsWith(', ') ? ', ' : ''
-                return { ...prev, search: currentSearch + separator + value }
-              })
-              // Clear the autocomplete input
-              setAutocompleteValue('')
-            }}
-          />
-          <Stack direction="row" spacing={1}>
-            <Input
-              value={editedItem?.geo?.lat ?? ''}
-              onChange={(e) => {
-                const value = e.target.value
+            value={editedItem?.geo?.lat ?? ''}
+            onChange={(e) => {
+              const value = e.target.value
 
-                // Check if value contains DMS format (degrees, minutes, seconds)
-                if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
-                  // Split by comma to check for lat,lon DMS pair
-                  const parts = value.split(',').map(s => s.trim())
+              // Check if value contains DMS format (degrees, minutes, seconds)
+              if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
+                // Split by comma to check for lat,lon DMS pair
+                const parts = value.split(',').map(s => s.trim())
 
-                  if (parts.length === 2) {
-                    // Parse both lat and lon as DMS
-                    const lat = parseDMS(parts[0])
-                    const lon = parseDMS(parts[1])
-                    if (lat !== null && lon !== null) {
-                      updateItem((prev: RawXmlItem | null) => prev ? {
-                        ...prev,
-                        geo: { lat: lat.toString(), lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
-                      } : null)
-                      return
-                    }
-                  } else {
-                    // Single DMS value for latitude only
-                    const lat = parseDMS(value)
-                    if (lat !== null) {
-                      updateItem((prev: RawXmlItem | null) => prev ? {
-                        ...prev,
-                        geo: { lat: lat.toString(), lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' },
-                      } : null)
-                      return
-                    }
+                if (parts.length === 2) {
+                  // Parse both lat and lon as DMS
+                  const lat = parseDMS(parts[0])
+                  const lon = parseDMS(parts[1])
+                  if (lat !== null && lon !== null) {
+                    updateItem((prev: RawXmlItem | null) => prev ? {
+                      ...prev,
+                      geo: { lat: lat.toString(), lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
+                    } : null)
+                    return
                   }
-                }
-
-                // Check if the value contains a comma (decimal lat,lon format)
-                if (value.includes(',')) {
-                  const [lat, lon] = value.split(',').map(s => s.trim())
-                  updateItem((prev: RawXmlItem | null) => prev ? {
-                    ...prev,
-                    geo: { lat: lat || '', lon: lon || '', accuracy: prev.geo?.accuracy || '' },
-                  } : null)
                 } else {
-                  // Plain value for latitude
-                  const lat = value
-                  updateItem((prev: RawXmlItem | null) => prev ? {
-                    ...prev,
-                    geo: lat || prev.geo?.lon ? { lat, lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' } : undefined,
-                  } : null)
-                }
-              }}
-              placeholder="Latitude (or lat,lon or DMS)"
-              title="Latitude (geo.lat) - paste lat,lon or DMS format to auto-split"
-              sx={{ flex: 1, minWidth: 0 }}
-            />
-            <Input
-              value={editedItem?.geo?.lon ?? ''}
-              onChange={(e) => {
-                const value = e.target.value
-
-                // Check if value contains DMS format
-                if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
-                  const lon = parseDMS(value)
-                  if (lon !== null) {
+                  // Single DMS value for latitude only
+                  const lat = parseDMS(value)
+                  if (lat !== null) {
                     updateItem((prev: RawXmlItem | null) => prev ? {
                       ...prev,
-                      geo: { lat: prev.geo?.lat || '', lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
+                      geo: { lat: lat.toString(), lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' },
                     } : null)
                     return
                   }
                 }
+              }
 
-                // Plain value for longitude
-                const lon = value
+              // Check if the value contains a comma (decimal lat,lon format)
+              if (value.includes(',')) {
+                const [lat, lon] = value.split(',').map(s => s.trim())
                 updateItem((prev: RawXmlItem | null) => prev ? {
                   ...prev,
-                  geo: lon || prev.geo?.lat ? { lat: prev.geo?.lat || '', lon, accuracy: prev.geo?.accuracy || '' } : undefined,
+                  geo: { lat: lat || '', lon: lon || '', accuracy: prev.geo?.accuracy || '' },
                 } : null)
-              }}
-              placeholder="Longitude (or DMS)"
-              title="Longitude (geo.lon) - paste DMS format to convert"
-              sx={{ flex: 1, minWidth: 0 }}
-            />
-            <GeoCopyButton />
-
-            <Input
-              value={editedItem?.geo?.accuracy ?? ''}
-              onChange={(e) => {
-                const accuracy = e.target.value
+              } else {
+                // Plain value for latitude
+                const lat = value
                 updateItem((prev: RawXmlItem | null) => prev ? {
                   ...prev,
-                  geo: prev.geo ? { ...prev.geo, accuracy } : undefined,
+                  geo: lat || prev.geo?.lon ? { lat, lon: prev.geo?.lon || '', accuracy: prev.geo?.accuracy || '' } : undefined,
                 } : null)
-              }}
-              placeholder="Accuracy"
-              title="Coordinate accuracy (geo.accuracy)"
-              type="number"
-              sx={{ flex: 0.6, minWidth: 0 }}
-            />
-          </Stack>
-          <Stack direction="row" spacing={2}>
-            <Select
-              value={editedItem?.ref?.source ?? ''}
-              onChange={(_, value) => {
-                updateItem((prev: RawXmlItem | null) => prev ? {
-                  ...prev,
-                  ref: value ? { source: value as ItemReferenceSource, name: prev.ref?.name || '' } : undefined,
-                } : null)
-              }}
-              placeholder="Reference Source"
-              title="Reference source (ref.source)"
-              sx={{ flex: 1, minWidth: 0 }}
-            >
-              <Option value="">None</Option>
-              {REFERENCE_SOURCES.map(source => (
-                <Option key={source} value={source}>{source.charAt(0).toUpperCase() + source.slice(1)}</Option>
-              ))}
-            </Select>
-            <Input
-              value={editedItem?.ref?.name ?? ''}
-              onChange={(e) => {
-                const name = e.target.value
-                updateItem((prev: RawXmlItem | null) => prev ? {
-                  ...prev,
-                  ref: prev.ref?.source ? { source: prev.ref.source, name } : undefined,
-                } : null)
-              }}
-              placeholder="Reference Name"
-              title="Reference name/ID (ref.name)"
-              sx={{ flex: 1, minWidth: 0 }}
-            />
-            <IconButton
-              size="sm"
-              variant="outlined"
-              onClick={() => {
-                const reference = transformReference(editedItem?.ref)
-                if (reference) {
-                  navigator.clipboard.writeText(reference[0])
+              }
+            }}
+            placeholder="Latitude (or lat,lon or DMS)"
+            title="Latitude (geo.lat) - paste lat,lon or DMS format to auto-split"
+            sx={{ flex: 1, minWidth: 0 }}
+          />
+          <Input
+            value={editedItem?.geo?.lon ?? ''}
+            onChange={(e) => {
+              const value = e.target.value
+
+              // Check if value contains DMS format
+              if (/\d+[°\s]+\d+['\s]+\d+/.test(value)) {
+                const lon = parseDMS(value)
+                if (lon !== null) {
+                  updateItem((prev: RawXmlItem | null) => prev ? {
+                    ...prev,
+                    geo: { lat: prev.geo?.lat || '', lon: lon.toString(), accuracy: prev.geo?.accuracy || '' },
+                  } : null)
+                  return
                 }
-              }}
-              disabled={!editedItem?.ref?.source || !editedItem?.ref?.name}
-              title="Copy reference URL to clipboard"
-              sx={{ minWidth: 'auto', px: 1 }}
-            >
-              📋
-            </IconButton>
-          </Stack>
-          <Button onClick={generateXml} variant="solid" color="primary">
-            Generate XML
-          </Button>
-          {xmlOutput && (
-            <Textarea
-              value={xmlOutput}
-              readOnly
-              minRows={10}
-              maxRows={20}
-              placeholder="Generated XML will appear here"
-            />
-          )}
+              }
+
+              // Plain value for longitude
+              const lon = value
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                geo: lon || prev.geo?.lat ? { lat: prev.geo?.lat || '', lon, accuracy: prev.geo?.accuracy || '' } : undefined,
+              } : null)
+            }}
+            placeholder="Longitude (or DMS)"
+            title="Longitude (geo.lon) - paste DMS format to convert"
+            sx={{ flex: 1, minWidth: 0 }}
+          />
+          <GeoCopyButton />
+
+          <Input
+            value={editedItem?.geo?.accuracy ?? ''}
+            onChange={(e) => {
+              const accuracy = e.target.value
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                geo: prev.geo ? { ...prev.geo, accuracy } : undefined,
+              } : null)
+            }}
+            placeholder="Accuracy"
+            title="Coordinate accuracy (geo.accuracy)"
+            type="number"
+            sx={{ flex: 0.6, minWidth: 0 }}
+          />
         </Stack>
+        <Stack direction="row" spacing={2}>
+          <Select
+            value={editedItem?.ref?.source ?? ''}
+            onChange={(_, value) => {
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                ref: value ? { source: value as ItemReferenceSource, name: prev.ref?.name || '' } : undefined,
+              } : null)
+            }}
+            placeholder="Reference Source"
+            title="Reference source (ref.source)"
+            sx={{ flex: 1, minWidth: 0 }}
+          >
+            <Option value="">None</Option>
+            {REFERENCE_SOURCES.map(source => (
+              <Option key={source} value={source}>{source.charAt(0).toUpperCase() + source.slice(1)}</Option>
+            ))}
+          </Select>
+          <Input
+            value={editedItem?.ref?.name ?? ''}
+            onChange={(e) => {
+              const name = e.target.value
+              updateItem((prev: RawXmlItem | null) => prev ? {
+                ...prev,
+                ref: prev.ref?.source ? { source: prev.ref.source, name } : undefined,
+              } : null)
+            }}
+            placeholder="Reference Name"
+            title="Reference name/ID (ref.name)"
+            sx={{ flex: 1, minWidth: 0 }}
+          />
+          <IconButton
+            size="sm"
+            variant="outlined"
+            onClick={() => {
+              const reference = transformReference(editedItem?.ref)
+              if (reference) {
+                navigator.clipboard.writeText(reference[0])
+              }
+            }}
+            disabled={!editedItem?.ref?.source || !editedItem?.ref?.name}
+            title="Copy reference URL to clipboard"
+            sx={{ minWidth: 'auto', px: 1 }}
+          >
+            📋
+          </IconButton>
+        </Stack>
+        <Button onClick={generateXml} variant="solid" color="primary">
+          Generate XML
+        </Button>
+        {children}
+        {xmlOutput && (
+          <Textarea
+            value={xmlOutput}
+            readOnly
+            minRows={10}
+            maxRows={20}
+            placeholder="Generated XML will appear here"
+          />
+        )}
       </Stack>
     </>
   )
diff --git a/src/components/AdminAlbum/Photo.tsx b/src/components/AdminAlbum/Photo.tsx
index 100507ae..168c5931 100644
--- a/src/components/AdminAlbum/Photo.tsx
+++ b/src/components/AdminAlbum/Photo.tsx
@@ -16,13 +16,17 @@ const fetcher = async (url: string, { arg }: { arg: string }) =>
     body: JSON.stringify({ path: arg }),
   }).then((res) => res.json())
 
-export default function AdminAlbumPhoto({ item, gallery }: { item: RawXmlItem, gallery: Gallery }) {
+export default function AdminAlbumPhoto(
+  { item, gallery, size = 'default' }:
+  { item: RawXmlItem, gallery: Gallery, size?: 'default' | 'small' },
+) {
   const { trigger, data, error, isMutating } = useSWRMutation(
     '/api/admin/classify',
     fetcher,
   )
 
   const path = photoPath(item.filename, gallery)
+  const dimensions = size === 'small' ? config.resizeDimensions.preview : config.resizeDimensions.photo
 
   return (
     <>
@@ -30,8 +34,8 @@ export default function AdminAlbumPhoto({ item, gallery }: { item: RawXmlItem, g
         <Img
           src={path}
           alt={item.thumb_caption || 'Photo'}
-          width={config.resizeDimensions.photo.width-200}
-          height={config.resizeDimensions.photo.height-200}
+          width={dimensions.width - 20}
+          height={dimensions.height - 20}
         />
         <Button
           onClick={(e) => {
diff --git a/src/components/AdminAlbum/Thumbs.tsx b/src/components/AdminAlbum/Thumbs.tsx
index 2df94308..a6cd5fd5 100644
--- a/src/components/AdminAlbum/Thumbs.tsx
+++ b/src/components/AdminAlbum/Thumbs.tsx
@@ -5,10 +5,10 @@ import ThumbImg from '../ThumbImg'
 
 export default function AdminAlbumThumbs(
   { xmlAlbum, gallery, setItem, currentIndex, selectedIndices }:
-  { 
-    xmlAlbum: RawXmlAlbum, 
-    gallery: Gallery, 
-    setItem: (item: RawXmlItem, index: number, isShift?: boolean) => void, 
+  {
+    xmlAlbum: RawXmlAlbum,
+    gallery: Gallery,
+    setItem: (item: RawXmlItem, index: number, isShift?: boolean) => void,
     currentIndex: number,
     selectedIndices?: Set<number>
   },
diff --git a/src/hooks/__tests__/useSearch.vitest.tsx b/src/hooks/__tests__/useSearch.vitest.tsx
index 3852d979..a373fec4 100644
--- a/src/hooks/__tests__/useSearch.vitest.tsx
+++ b/src/hooks/__tests__/useSearch.vitest.tsx
@@ -152,7 +152,7 @@ describe('Router ready', () => {
       { corpus: 'orange juice and grapes' },
       { corpus: 'cherry tart dessert' },
     ]
-    
+
     const { result, rerender } = renderHook(() => useSearch({ items, indexedKeywords: [] }))
 
     // Initial state: only 1 item matches "apple banana"

From 44f04ec0ac6bc8ec15b66672aa1ef9485140952a Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Mon, 26 Jan 2026 17:11:56 -0800
Subject: [PATCH 27/33] feat(Admin > Edit Album): Yellow border to indicate
 multiple selected thumbs

---
 src/components/AdminAlbum/Thumbs.tsx      | 2 ++
 src/components/ThumbImg/index.tsx         | 8 +++++---
 src/components/ThumbImg/styles.module.css | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/AdminAlbum/Thumbs.tsx b/src/components/AdminAlbum/Thumbs.tsx
index a6cd5fd5..6cf17769 100644
--- a/src/components/AdminAlbum/Thumbs.tsx
+++ b/src/components/AdminAlbum/Thumbs.tsx
@@ -14,6 +14,7 @@ export default function AdminAlbumThumbs(
   },
 ) {
   const items = xmlAlbum.album.item ? (Array.isArray(xmlAlbum.album.item) ? xmlAlbum.album.item : [xmlAlbum.album.item]) : []
+  const hasMultiSelection = (selectedIndices?.size ?? 0) > 1
 
   if (items.length === 0) {
     return <div>No items found</div>
@@ -34,6 +35,7 @@ export default function AdminAlbumThumbs(
               key={filename}
               id={`select${item.$.id}`}
               viewed={isSelected}
+              multiSelected={hasMultiSelection && isSelected}
             />
           )
         })}
diff --git a/src/components/ThumbImg/index.tsx b/src/components/ThumbImg/index.tsx
index a382391d..3f03ce3b 100644
--- a/src/components/ThumbImg/index.tsx
+++ b/src/components/ThumbImg/index.tsx
@@ -4,9 +4,9 @@ import config from '../../../src/models/config'
 import Img from '../Img'
 import styles from './styles.module.css'
 
-function getViewed(viewed: boolean) {
+function getViewed(viewed: boolean, multiSelected: boolean) {
   if (viewed) {
-    return `${styles.highlight} ${styles.imgButton}`
+    return `${multiSelected ? styles.highlightMulti : styles.highlight} ${styles.imgButton}`
   }
   return styles.imgButton
 }
@@ -18,6 +18,7 @@ function ThumbImg({
   src,
   id,
   viewed: globalViewed = false,
+  multiSelected = false,
 }: {
   onClick?: (event: MouseEvent<HTMLAnchorElement | HTMLUListElement>) => void;
   caption: string;
@@ -25,6 +26,7 @@ function ThumbImg({
   src: string;
   id: string;
   viewed: boolean;
+  multiSelected?: boolean;
 }) {
   // Keep visuals (local state for immediate feedback) but never reset globally
   const [viewed, setViewed] = useState(globalViewed)
@@ -43,7 +45,7 @@ function ThumbImg({
 
   return (
     <li className={styles.bullet}>
-      <a className={getViewed(globalViewed || viewed)} href={href} onClick={handleClick} id={id}>
+      <a className={getViewed(globalViewed || viewed, multiSelected)} href={href} onClick={handleClick} id={id}>
         <Img
           src={src}
           alt={caption}
diff --git a/src/components/ThumbImg/styles.module.css b/src/components/ThumbImg/styles.module.css
index 4593717d..9f1b2ce4 100644
--- a/src/components/ThumbImg/styles.module.css
+++ b/src/components/ThumbImg/styles.module.css
@@ -25,3 +25,6 @@
 .highlight {
   border-color: white;
 }
+.highlightMulti {
+  border-color: #d9c24a;
+}

From c64fa616b4075c896342ca6160953541c8d4ed31 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 31 Jan 2026 09:56:13 -0800
Subject: [PATCH 28/33] chore(release): 12.3.0

---
 CHANGELOG.md      | 56 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4178a681..c336c28c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,62 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [12.3.0](https://github.com/danactive/history/compare/v12.2.0...v12.3.0) (2026-01-31)
+
+
+### Features
+
+* **Admin > Edit Album:** Add Edit count pill ([27ebcf7](https://github.com/danactive/history/commit/27ebcf71addc9cc4c0b7763047df01a1f76d7c8f))
+* **Admin > Edit Album:** Add filename filter before Gallery/Album dropdown ([937a8f2](https://github.com/danactive/history/commit/937a8f2b2f464f13834b1bb13ae69911448c3c60))
+* **Admin > Edit Album:** Add keyword autocomplete ([585ef57](https://github.com/danactive/history/commit/585ef578b22ea972f10939368cbee762d4fbff53))
+* **Admin > Edit Album:** Change layout to vertical thumbs with sticky Fields ([e03fa23](https://github.com/danactive/history/commit/e03fa23096cccff09af76543d1257a9a8689440a))
+* **Admin > Edit Album:** Clipboard for reference ([104c0d7](https://github.com/danactive/history/commit/104c0d77b6d34bf95423f964be09eb7d3b5194f6))
+* **Admin > Edit Album:** Discard empty XML elements ([1ca56d2](https://github.com/danactive/history/commit/1ca56d2dd254e430d517d725f004bf22de2b38d1))
+* **Admin > Edit Album:** Edit multiple photos ([c3f3720](https://github.com/danactive/history/commit/c3f37202bf7b99d71a4a04ff68fb57a45c44c7e3))
+* **Admin > Edit Album:** Generate XML ready for copy and paste ([456fb5e](https://github.com/danactive/history/commit/456fb5e0aafabcb94268da87d8d36e2a089d3f8c))
+* **Admin > Edit Album:** Input lat,long spilt, clipboard, allow degrees minutes format ([b30d189](https://github.com/danactive/history/commit/b30d18902ceee972e5089b8a676774b3494ab9cf))
+* **Admin > Edit Album:** Keyboard arrows next and prev image ([b29b2aa](https://github.com/danactive/history/commit/b29b2aa8cff7b8aad5d44c7eb43c97c54e0d7e56))
+* **Admin > Edit Album:** Persist album data ([9512cee](https://github.com/danactive/history/commit/9512ceec2129b725f8e8ba2b1ac5a73fb5b397c2))
+* **Admin > Edit Album:** Refactor all keyword items ([8bc1696](https://github.com/danactive/history/commit/8bc1696d4cc594ac684fb782f7eb8f9cc141fcde))
+* **Admin > Edit Album:** Yellow border to indicate multiple selected thumbs ([44f04ec](https://github.com/danactive/history/commit/44f04ec0ac6bc8ec15b66672aa1ef9485140952a))
+* **Admin > Rename:** Add test for moving videos to video folder ([df39cb1](https://github.com/danactive/history/commit/df39cb14964968eed3ad3d38f337fce2263aed8c))
+* **Admin > Rename:** When renaming force file type to be lower ([82b2319](https://github.com/danactive/history/commit/82b2319b35b50db1610fdb891ff3c6178fe40c54))
+* **Map > Cluster:** Add labels to clustered ([dee4996](https://github.com/danactive/history/commit/dee499600a5e333d7c30fdbb9dc932113cd34d69))
+* **Map > Cluster:** Change label to City above neighbourhood ([32f830d](https://github.com/danactive/history/commit/32f830d78998cc3721c182856709771540056fe8))
+* **Map > Cluster:** Generate cluster at build time not runtime ([3f6e5ac](https://github.com/danactive/history/commit/3f6e5acbcc56d1d9b26ba197e6bcf494c09c2caa))
+* **Map > Cluster:** Generate cluster labels 50km, 10, 1.5, 500m ([c443a9e](https://github.com/danactive/history/commit/c443a9ec701b860c22bc80d39119b5f65c4c4dad))
+* **Map > Cluster:** Generate cluster labels 50km, 10, 2, 500m ([51c27ea](https://github.com/danactive/history/commit/51c27eaeb1253abc97e4e7005a3c00106008edbc))
+* **package.json:** Upgrade Next.js v16 ([bd69ca9](https://github.com/danactive/history/commit/bd69ca96f3ea874fef00b42091c178c1ce2b0b76))
+* **Slippy Map:** Cache clustering and UI ([813eb48](https://github.com/danactive/history/commit/813eb484c9b0db80383f191c9d81e0b1453d550d))
+* **Slippy Map:** Use H3 for better spatial consistency of marker clusters ([4276d74](https://github.com/danactive/history/commit/4276d7402333a8716422d45a7b8bb02355643148))
+* **useSearch:** Allow complex search expression ([eaa3115](https://github.com/danactive/history/commit/eaa3115c8b6f1a9a34d8f3864926ef0f9bb5276a))
+* **View Album > useSearch:** Add Bookmark button ([75a2bf2](https://github.com/danactive/history/commit/75a2bf2c326dd3993f5dc53637dbd748c8efd6ce))
+* **View Album > useSearch:** Add Expand button ([e64099f](https://github.com/danactive/history/commit/e64099f30053b1c5c964374498a9afe18e39380f))
+* **View Album > useSearch:** Rename Expand button to Clear ([e9ebfa8](https://github.com/danactive/history/commit/e9ebfa8978ddcf18c5e0272e87b4ccfc9cfb5414))
+
+
+### Bug Fixes
+
+* **Admin > Edit Album:** Fix the XML order ([161986f](https://github.com/danactive/history/commit/161986f0df27558d83a60261795d4a314a698aa2))
+* **Admin > Rename:** Add another unit test for HEIC pairs ([12280fa](https://github.com/danactive/history/commit/12280fa84fca67a7d275a972d8a257fde11089d4))
+* **Admin > Rename:** Add test for lowercase names ([3522e95](https://github.com/danactive/history/commit/3522e959f1da39d5c92efa8c6d616bad535be29e))
+* **Admin > Rename:** Check if the destination directories ([9680f6d](https://github.com/danactive/history/commit/9680f6d5c7d8c002c252fcfd7ecc87a703dcc07c))
+* **Admin > Rename:** Return skipped count if case filename collision found ([cacdb99](https://github.com/danactive/history/commit/cacdb9992714f988bf1526fe1f67465fdb1903fe))
+* **Admin > Walk:** HEIF as ext is included with heif ([37cd62c](https://github.com/danactive/history/commit/37cd62ccc1c0591ba8e22e544b8ab5685981a9a2))
+* **All:** Restore description to appear in photo gallery ([8ea2d23](https://github.com/danactive/history/commit/8ea2d230fe80bd109534cf033ae92a9b4b002430))
+* **npm run build:** Remove Node.js from client component ([8295287](https://github.com/danactive/history/commit/8295287e2d6dfd5ca403d57fdc6e2e7636a35f09))
+* **package:** Conform to Turbopack breaking changes ([185f6cf](https://github.com/danactive/history/commit/185f6cf78b45c10ce01d09463a54fcd127e142ed))
+* **package:** Enable React compiler ([7c65161](https://github.com/danactive/history/commit/7c65161f0c4725534cc11bd234002d03371c060e))
+* **package:** More Next.js issues to resolve ([a58973c](https://github.com/danactive/history/commit/a58973c19d8e022ccbc00d2af67ab635826d80a1))
+* **Page > All:** Decrease server JSON by 4MB ([d932593](https://github.com/danactive/history/commit/d932593340ab31c3d4f97b6b12eaa98a26832f10))
+* **Slippy Map:** Tweak CSS ([0e2fa64](https://github.com/danactive/history/commit/0e2fa649f3f1bd4451b3272d80a068e15d7b37cd))
+* **useSearch:** Avoid circular dependency ([02e70b1](https://github.com/danactive/history/commit/02e70b162f7396e7052a62ed9e7ab68431359597))
+* **useSearch:** Clean button is improved right of Filter btn ([6aa4dac](https://github.com/danactive/history/commit/6aa4dacd54039af3322d0673950c4cb9c7d2a2c0))
+* **useSearch:** Clear button clears the input value too ([4a9c0c1](https://github.com/danactive/history/commit/4a9c0c1c9e651e92230fd76a4e0902b5828245e6))
+* **useSearch:** Prevent case naming collision ([249ccd7](https://github.com/danactive/history/commit/249ccd72553c5327f9cb625904421ccfe57ef1c7))
+* **UseSearch:** URL filtered galleries display the filter count ([dcd31be](https://github.com/danactive/history/commit/dcd31be63f18a5552523b8e46ac70f07bab6a451))
+* **useSearch:** URL initials keywords put value in input too ([8cec71d](https://github.com/danactive/history/commit/8cec71df6af965ccc444114a8e162774c7e02467))
+
 ## [12.2.0](https://github.com/danactive/history/compare/v12.1.0...v12.2.0) (2025-11-23)
 
 
diff --git a/package-lock.json b/package-lock.json
index 475c653c..d7c77078 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "history-app",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "history-app",
-      "version": "12.2.0",
+      "version": "12.3.0",
       "license": "MIT",
       "dependencies": {
         "@emotion/react": "^11.14.0",
diff --git a/package.json b/package.json
index 118cb0a4..728be05a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "history-app",
-  "version": "12.2.0",
+  "version": "12.3.0",
   "private": true,
   "type": "module",
   "scripts": {

From 0f11f41f49efc9412f262bf262bb6eff77638d4e Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 31 Jan 2026 10:15:54 -0800
Subject: [PATCH 29/33] chore(package): Bump deps to minor

---
 .nvmrc                          |   2 +-
 package-lock.json               | 776 ++++++++++++++++----------------
 package.json                    |  26 +-
 src/components/Albums/index.tsx |   2 +-
 4 files changed, 393 insertions(+), 413 deletions(-)

diff --git a/.nvmrc b/.nvmrc
index c519bf5b..e8416a15 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v24.11.0
+v24.13.0
diff --git a/package-lock.json b/package-lock.json
index d7c77078..9b738461 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,39 +19,39 @@
         "glob": "^13.0.0",
         "h3-js": "^4.4.0",
         "heic-convert": "^2.1.0",
-        "mapbox-gl": "^3.17.0",
+        "mapbox-gl": "^3.18.1",
         "mime-types": "^3.0.2",
-        "next": "16.1.1",
-        "react": "19.2.3",
-        "react-dom": "19.2.3",
+        "next": "^16.1.6",
+        "react": "19.2.4",
+        "react-dom": "19.2.4",
         "react-image-gallery": "^1.4.0",
         "react-map-gl": "^8.1.0",
         "sharp": "^0.34.5",
         "stylis": "^4.3.6",
         "swr": "^2.3.8",
         "xml2js": "^0.6.2",
-        "zod": "^4.3.5"
+        "zod": "^4.3.6"
       },
       "devDependencies": {
         "@eslint/js": "^9.28.0",
-        "@next/eslint-plugin-next": "16.1.1",
-        "@playwright/test": "^1.57.0",
+        "@next/eslint-plugin-next": "^16.1.1",
+        "@playwright/test": "^1.58.1",
         "@testing-library/jest-dom": "^6.9.1",
-        "@testing-library/react": "^16.3.1",
+        "@testing-library/react": "^16.3.2",
         "@types/boom": "^7.3.5",
         "@types/geojson": "^7946.0.16",
         "@types/heic-convert": "^2.1.0",
         "@types/jest": "^30.0.0",
         "@types/mime-types": "^3.0.1",
-        "@types/node": "^24.10.8",
-        "@types/react": "19.2.7",
+        "@types/node": "^24.10.9",
+        "@types/react": "19.2.10",
         "@types/react-dom": "19.2.3",
         "@types/react-image-gallery": "^1.2.4",
         "@types/xml2js": "^0.4.14",
         "@typescript-eslint/eslint-plugin": "^8.48.1",
         "@typescript-eslint/parser": "^8.48.1",
         "eslint": "^9.39.2",
-        "eslint-config-next": "16.1.1",
+        "eslint-config-next": "^16.1.6",
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-jest-dom": "^5.5.0",
         "eslint-plugin-jsdoc": "^61.7.1",
@@ -60,7 +60,7 @@
         "jest": "^30.2.0",
         "jest-environment-jsdom": "^30.2.0",
         "next-test-api-route-handler": "^5.0.3",
-        "snyk": "^1.1301.2",
+        "snyk": "^1.1302.1",
         "standard-version": "^9.5.0",
         "ts-jest": "^29.4.6",
         "tsx": "^4.21.0",
@@ -104,9 +104,9 @@
       "license": "ISC"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz",
-      "integrity": "sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.28.5",
@@ -118,9 +118,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.6.tgz",
-      "integrity": "sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
+      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -128,21 +128,22 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz",
-      "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
+      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/generator": "^7.28.6",
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
         "@babel/helper-compilation-targets": "^7.28.6",
         "@babel/helper-module-transforms": "^7.28.6",
         "@babel/helpers": "^7.28.6",
-        "@babel/parser": "^7.28.6",
+        "@babel/parser": "^7.29.0",
         "@babel/template": "^7.28.6",
-        "@babel/traverse": "^7.28.6",
-        "@babel/types": "^7.28.6",
+        "@babel/traverse": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/remapping": "^2.3.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
@@ -176,13 +177,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.6.tgz",
-      "integrity": "sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.0.tgz",
+      "integrity": "sha512-vSH118/wwM/pLR38g/Sgk05sNtro6TlTJKuiMXDaZqPUfjTFcudpCOt00IhOfj+1BFAX+UFAlzCU+6WXr3GLFQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.6",
-        "@babel/types": "^7.28.6",
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -311,12 +312,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz",
-      "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
+      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.6"
+        "@babel/types": "^7.29.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -588,17 +589,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.6.tgz",
-      "integrity": "sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
+      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.28.6",
-        "@babel/generator": "^7.28.6",
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.6",
+        "@babel/parser": "^7.29.0",
         "@babel/template": "^7.28.6",
-        "@babel/types": "^7.28.6",
+        "@babel/types": "^7.29.0",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -606,9 +607,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.6.tgz",
-      "integrity": "sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -713,6 +714,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -736,6 +738,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -866,6 +869,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
       "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -909,6 +913,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
       "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -1641,31 +1646,31 @@
       "license": "MIT"
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
-      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.4.tgz",
+      "integrity": "sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/utils": "^0.2.10"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
-      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.5.tgz",
+      "integrity": "sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.7.3",
+        "@floating-ui/core": "^1.7.4",
         "@floating-ui/utils": "^0.2.10"
       }
     },
     "node_modules/@floating-ui/react-dom": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.6.tgz",
-      "integrity": "sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.7.tgz",
+      "integrity": "sha512-0tLRojf/1Go2JgEVm+3Frg9A3IW8bJgKgdO0BN5RkF//ufuz2joZM63Npau2ff3J6lUVYgDSNzNkR+aH3IVfjg==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/dom": "^1.7.4"
+        "@floating-ui/dom": "^1.7.5"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -3289,15 +3294,15 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.1.tgz",
-      "integrity": "sha512-3oxyM97Sr2PqiVyMyrZUtrtM3jqqFxOQJVuKclDsgj/L728iZt/GyslkN4NwarledZATCenbk4Offjk1hQmaAA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.6.tgz",
+      "integrity": "sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==",
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-16.1.1.tgz",
-      "integrity": "sha512-Ovb/6TuLKbE1UiPcg0p39Ke3puyTCIKN9hGbNItmpQsp+WX3qrjO3WaMVSi6JHr9X1NrmthqIguVHodMJbh/dw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-16.1.6.tgz",
+      "integrity": "sha512-/Qq3PTagA6+nYVfryAtQ7/9FEr/6YVyvOtl6rZnGsbReGLf0jZU6gkpr1FuChAQpvV46a78p4cmHOVP8mbfSMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3305,9 +3310,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.1.tgz",
-      "integrity": "sha512-JS3m42ifsVSJjSTzh27nW+Igfha3NdBOFScr9C80hHGrWx55pTrVL23RJbqir7k7/15SKlrLHhh/MQzqBBYrQA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.6.tgz",
+      "integrity": "sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==",
       "cpu": [
         "arm64"
       ],
@@ -3321,9 +3326,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.1.tgz",
-      "integrity": "sha512-hbyKtrDGUkgkyQi1m1IyD3q4I/3m9ngr+V93z4oKHrPcmxwNL5iMWORvLSGAf2YujL+6HxgVvZuCYZfLfb4bGw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.6.tgz",
+      "integrity": "sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==",
       "cpu": [
         "x64"
       ],
@@ -3337,9 +3342,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.1.tgz",
-      "integrity": "sha512-/fvHet+EYckFvRLQ0jPHJCUI5/B56+2DpI1xDSvi80r/3Ez+Eaa2Yq4tJcRTaB1kqj/HrYKn8Yplm9bNoMJpwQ==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.6.tgz",
+      "integrity": "sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==",
       "cpu": [
         "arm64"
       ],
@@ -3353,9 +3358,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.1.tgz",
-      "integrity": "sha512-MFHrgL4TXNQbBPzkKKur4Fb5ICEJa87HM7fczFs2+HWblM7mMLdco3dvyTI+QmLBU9xgns/EeeINSZD6Ar+oLg==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.6.tgz",
+      "integrity": "sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==",
       "cpu": [
         "arm64"
       ],
@@ -3369,9 +3374,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.1.tgz",
-      "integrity": "sha512-20bYDfgOQAPUkkKBnyP9PTuHiJGM7HzNBbuqmD0jiFVZ0aOldz+VnJhbxzjcSabYsnNjMPsE0cyzEudpYxsrUQ==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.6.tgz",
+      "integrity": "sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==",
       "cpu": [
         "x64"
       ],
@@ -3385,9 +3390,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.1.tgz",
-      "integrity": "sha512-9pRbK3M4asAHQRkwaXwu601oPZHghuSC8IXNENgbBSyImHv/zY4K5udBusgdHkvJ/Tcr96jJwQYOll0qU8+fPA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.6.tgz",
+      "integrity": "sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==",
       "cpu": [
         "x64"
       ],
@@ -3401,9 +3406,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.1.tgz",
-      "integrity": "sha512-bdfQkggaLgnmYrFkSQfsHfOhk/mCYmjnrbRCGgkMcoOBZ4n+TRRSLmT/CU5SATzlBJ9TpioUyBW/vWFXTqQRiA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.6.tgz",
+      "integrity": "sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==",
       "cpu": [
         "arm64"
       ],
@@ -3417,9 +3422,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.1.tgz",
-      "integrity": "sha512-Ncwbw2WJ57Al5OX0k4chM68DKhEPlrXBaSXDCi2kPi5f4d8b3ejr3RRJGfKBLrn2YJL5ezNS7w2TZLHSti8CMw==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.6.tgz",
+      "integrity": "sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==",
       "cpu": [
         "x64"
       ],
@@ -3505,13 +3510,14 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.57.0",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz",
-      "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==",
+      "version": "1.58.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.1.tgz",
+      "integrity": "sha512-6LdVIUERWxQMmUSSQi0I53GgCBYgM2RpGngCPY7hSeju+VrKjq3lvs7HpJoPbDiY5QM5EYRtRX5fvrinnMAz3w==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
-        "playwright": "1.57.0"
+        "playwright": "1.58.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -3531,9 +3537,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.55.1.tgz",
-      "integrity": "sha512-9R0DM/ykwfGIlNu6+2U09ga0WXeZ9MRC2Ter8jnz8415VbuIykVuc6bhdrbORFZANDmTDvq26mJrEVTl8TdnDg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.57.1.tgz",
+      "integrity": "sha512-A6ehUVSiSaaliTxai040ZpZ2zTevHYbvu/lDoeAteHI8QnaosIzm4qwtezfRg1jOYaUmnzLX1AOD6Z+UJjtifg==",
       "cpu": [
         "arm"
       ],
@@ -3545,9 +3551,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.55.1.tgz",
-      "integrity": "sha512-eFZCb1YUqhTysgW3sj/55du5cG57S7UTNtdMjCW7LwVcj3dTTcowCsC8p7uBdzKsZYa8J7IDE8lhMI+HX1vQvg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.57.1.tgz",
+      "integrity": "sha512-dQaAddCY9YgkFHZcFNS/606Exo8vcLHwArFZ7vxXq4rigo2bb494/xKMMwRRQW6ug7Js6yXmBZhSBRuBvCCQ3w==",
       "cpu": [
         "arm64"
       ],
@@ -3559,9 +3565,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.55.1.tgz",
-      "integrity": "sha512-p3grE2PHcQm2e8PSGZdzIhCKbMCw/xi9XvMPErPhwO17vxtvCN5FEA2mSLgmKlCjHGMQTP6phuQTYWUnKewwGg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.57.1.tgz",
+      "integrity": "sha512-crNPrwJOrRxagUYeMn/DZwqN88SDmwaJ8Cvi/TN1HnWBU7GwknckyosC2gd0IqYRsHDEnXf328o9/HC6OkPgOg==",
       "cpu": [
         "arm64"
       ],
@@ -3573,9 +3579,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.55.1.tgz",
-      "integrity": "sha512-rDUjG25C9qoTm+e02Esi+aqTKSBYwVTaoS1wxcN47/Luqef57Vgp96xNANwt5npq9GDxsH7kXxNkJVEsWEOEaQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.57.1.tgz",
+      "integrity": "sha512-Ji8g8ChVbKrhFtig5QBV7iMaJrGtpHelkB3lsaKzadFBe58gmjfGXAOfI5FV0lYMH8wiqsxKQ1C9B0YTRXVy4w==",
       "cpu": [
         "x64"
       ],
@@ -3587,9 +3593,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.55.1.tgz",
-      "integrity": "sha512-+JiU7Jbp5cdxekIgdte0jfcu5oqw4GCKr6i3PJTlXTCU5H5Fvtkpbs4XJHRmWNXF+hKmn4v7ogI5OQPaupJgOg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.57.1.tgz",
+      "integrity": "sha512-R+/WwhsjmwodAcz65guCGFRkMb4gKWTcIeLy60JJQbXrJ97BOXHxnkPFrP+YwFlaS0m+uWJTstrUA9o+UchFug==",
       "cpu": [
         "arm64"
       ],
@@ -3601,9 +3607,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.55.1.tgz",
-      "integrity": "sha512-V5xC1tOVWtLLmr3YUk2f6EJK4qksksOYiz/TCsFHu/R+woubcLWdC9nZQmwjOAbmExBIVKsm1/wKmEy4z4u4Bw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.57.1.tgz",
+      "integrity": "sha512-IEQTCHeiTOnAUC3IDQdzRAGj3jOAYNr9kBguI7MQAAZK3caezRrg0GxAb6Hchg4lxdZEI5Oq3iov/w/hnFWY9Q==",
       "cpu": [
         "x64"
       ],
@@ -3615,9 +3621,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.55.1.tgz",
-      "integrity": "sha512-Rn3n+FUk2J5VWx+ywrG/HGPTD9jXNbicRtTM11e/uorplArnXZYsVifnPPqNNP5BsO3roI4n8332ukpY/zN7rQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.57.1.tgz",
+      "integrity": "sha512-F8sWbhZ7tyuEfsmOxwc2giKDQzN3+kuBLPwwZGyVkLlKGdV1nvnNwYD0fKQ8+XS6hp9nY7B+ZeK01EBUE7aHaw==",
       "cpu": [
         "arm"
       ],
@@ -3629,9 +3635,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.55.1.tgz",
-      "integrity": "sha512-grPNWydeKtc1aEdrJDWk4opD7nFtQbMmV7769hiAaYyUKCT1faPRm2av8CX1YJsZ4TLAZcg9gTR1KvEzoLjXkg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.57.1.tgz",
+      "integrity": "sha512-rGfNUfn0GIeXtBP1wL5MnzSj98+PZe/AXaGBCRmT0ts80lU5CATYGxXukeTX39XBKsxzFpEeK+Mrp9faXOlmrw==",
       "cpu": [
         "arm"
       ],
@@ -3643,9 +3649,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.55.1.tgz",
-      "integrity": "sha512-a59mwd1k6x8tXKcUxSyISiquLwB5pX+fJW9TkWU46lCqD/GRDe9uDN31jrMmVP3feI3mhAdvcCClhV8V5MhJFQ==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.57.1.tgz",
+      "integrity": "sha512-MMtej3YHWeg/0klK2Qodf3yrNzz6CGjo2UntLvk2RSPlhzgLvYEB3frRvbEF2wRKh1Z2fDIg9KRPe1fawv7C+g==",
       "cpu": [
         "arm64"
       ],
@@ -3657,9 +3663,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.55.1.tgz",
-      "integrity": "sha512-puS1MEgWX5GsHSoiAsF0TYrpomdvkaXm0CofIMG5uVkP6IBV+ZO9xhC5YEN49nsgYo1DuuMquF9+7EDBVYu4uA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.57.1.tgz",
+      "integrity": "sha512-1a/qhaaOXhqXGpMFMET9VqwZakkljWHLmZOX48R0I/YLbhdxr1m4gtG1Hq7++VhVUmf+L3sTAf9op4JlhQ5u1Q==",
       "cpu": [
         "arm64"
       ],
@@ -3671,9 +3677,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.55.1.tgz",
-      "integrity": "sha512-r3Wv40in+lTsULSb6nnoudVbARdOwb2u5fpeoOAZjFLznp6tDU8kd+GTHmJoqZ9lt6/Sys33KdIHUaQihFcu7g==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.57.1.tgz",
+      "integrity": "sha512-QWO6RQTZ/cqYtJMtxhkRkidoNGXc7ERPbZN7dVW5SdURuLeVU7lwKMpo18XdcmpWYd0qsP1bwKPf7DNSUinhvA==",
       "cpu": [
         "loong64"
       ],
@@ -3685,9 +3691,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.55.1.tgz",
-      "integrity": "sha512-MR8c0+UxAlB22Fq4R+aQSPBayvYa3+9DrwG/i1TKQXFYEaoW3B5b/rkSRIypcZDdWjWnpcvxbNaAJDcSbJU3Lw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.57.1.tgz",
+      "integrity": "sha512-xpObYIf+8gprgWaPP32xiN5RVTi/s5FCR+XMXSKmhfoJjrpRAjCuuqQXyxUa/eJTdAE6eJ+KDKaoEqjZQxh3Gw==",
       "cpu": [
         "loong64"
       ],
@@ -3699,9 +3705,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.55.1.tgz",
-      "integrity": "sha512-3KhoECe1BRlSYpMTeVrD4sh2Pw2xgt4jzNSZIIPLFEsnQn9gAnZagW9+VqDqAHgm1Xc77LzJOo2LdigS5qZ+gw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.57.1.tgz",
+      "integrity": "sha512-4BrCgrpZo4hvzMDKRqEaW1zeecScDCR+2nZ86ATLhAoJ5FQ+lbHVD3ttKe74/c7tNT9c6F2viwB3ufwp01Oh2w==",
       "cpu": [
         "ppc64"
       ],
@@ -3713,9 +3719,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.55.1.tgz",
-      "integrity": "sha512-ziR1OuZx0vdYZZ30vueNZTg73alF59DicYrPViG0NEgDVN8/Jl87zkAPu4u6VjZST2llgEUjaiNl9JM6HH1Vdw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.57.1.tgz",
+      "integrity": "sha512-NOlUuzesGauESAyEYFSe3QTUguL+lvrN1HtwEEsU2rOwdUDeTMJdO5dUYl/2hKf9jWydJrO9OL/XSSf65R5+Xw==",
       "cpu": [
         "ppc64"
       ],
@@ -3727,9 +3733,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.55.1.tgz",
-      "integrity": "sha512-uW0Y12ih2XJRERZ4jAfKamTyIHVMPQnTZcQjme2HMVDAHY4amf5u414OqNYC+x+LzRdRcnIG1YodLrrtA8xsxw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.57.1.tgz",
+      "integrity": "sha512-ptA88htVp0AwUUqhVghwDIKlvJMD/fmL/wrQj99PRHFRAG6Z5nbWoWG4o81Nt9FT+IuqUQi+L31ZKAFeJ5Is+A==",
       "cpu": [
         "riscv64"
       ],
@@ -3741,9 +3747,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.55.1.tgz",
-      "integrity": "sha512-u9yZ0jUkOED1BFrqu3BwMQoixvGHGZ+JhJNkNKY/hyoEgOwlqKb62qu+7UjbPSHYjiVy8kKJHvXKv5coH4wDeg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.57.1.tgz",
+      "integrity": "sha512-S51t7aMMTNdmAMPpBg7OOsTdn4tySRQvklmL3RpDRyknk87+Sp3xaumlatU+ppQ+5raY7sSTcC2beGgvhENfuw==",
       "cpu": [
         "riscv64"
       ],
@@ -3755,9 +3761,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.55.1.tgz",
-      "integrity": "sha512-/0PenBCmqM4ZUd0190j7J0UsQ/1nsi735iPRakO8iPciE7BQ495Y6msPzaOmvx0/pn+eJVVlZrNrSh4WSYLxNg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.57.1.tgz",
+      "integrity": "sha512-Bl00OFnVFkL82FHbEqy3k5CUCKH6OEJL54KCyx2oqsmZnFTR8IoNqBF+mjQVcRCT5sB6yOvK8A37LNm/kPJiZg==",
       "cpu": [
         "s390x"
       ],
@@ -3769,9 +3775,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.55.1.tgz",
-      "integrity": "sha512-a8G4wiQxQG2BAvo+gU6XrReRRqj+pLS2NGXKm8io19goR+K8lw269eTrPkSdDTALwMmJp4th2Uh0D8J9bEV1vg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.57.1.tgz",
+      "integrity": "sha512-ABca4ceT4N+Tv/GtotnWAeXZUZuM/9AQyCyKYyKnpk4yoA7QIAuBt6Hkgpw8kActYlew2mvckXkvx0FfoInnLg==",
       "cpu": [
         "x64"
       ],
@@ -3783,9 +3789,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.55.1.tgz",
-      "integrity": "sha512-bD+zjpFrMpP/hqkfEcnjXWHMw5BIghGisOKPj+2NaNDuVT+8Ds4mPf3XcPHuat1tz89WRL+1wbcxKY3WSbiT7w==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.57.1.tgz",
+      "integrity": "sha512-HFps0JeGtuOR2convgRRkHCekD7j+gdAuXM+/i6kGzQtFhlCtQkpwtNzkNj6QhCDp7DRJ7+qC/1Vg2jt5iSOFw==",
       "cpu": [
         "x64"
       ],
@@ -3797,9 +3803,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.55.1.tgz",
-      "integrity": "sha512-eLXw0dOiqE4QmvikfQ6yjgkg/xDM+MdU9YJuP4ySTibXU0oAvnEWXt7UDJmD4UkYialMfOGFPJnIHSe/kdzPxg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.57.1.tgz",
+      "integrity": "sha512-H+hXEv9gdVQuDTgnqD+SQffoWoc0Of59AStSzTEj/feWTBAnSfSD3+Dql1ZruJQxmykT/JVY0dE8Ka7z0DH1hw==",
       "cpu": [
         "x64"
       ],
@@ -3811,9 +3817,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.55.1.tgz",
-      "integrity": "sha512-xzm44KgEP11te3S2HCSyYf5zIzWmx3n8HDCc7EE59+lTcswEWNpvMLfd9uJvVX8LCg9QWG67Xt75AuHn4vgsXw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.57.1.tgz",
+      "integrity": "sha512-4wYoDpNg6o/oPximyc/NG+mYUejZrCU2q+2w6YZqrAs2UcNUChIZXjtafAiiZSUc7On8v5NyNj34Kzj/Ltk6dQ==",
       "cpu": [
         "arm64"
       ],
@@ -3825,9 +3831,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.55.1.tgz",
-      "integrity": "sha512-yR6Bl3tMC/gBok5cz/Qi0xYnVbIxGx5Fcf/ca0eB6/6JwOY+SRUcJfI0OpeTpPls7f194as62thCt/2BjxYN8g==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.57.1.tgz",
+      "integrity": "sha512-O54mtsV/6LW3P8qdTcamQmuC990HDfR71lo44oZMZlXU4tzLrbvTii87Ni9opq60ds0YzuAlEr/GNwuNluZyMQ==",
       "cpu": [
         "arm64"
       ],
@@ -3839,9 +3845,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.55.1.tgz",
-      "integrity": "sha512-3fZBidchE0eY0oFZBnekYCfg+5wAB0mbpCBuofh5mZuzIU/4jIVkbESmd2dOsFNS78b53CYv3OAtwqkZZmU5nA==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.57.1.tgz",
+      "integrity": "sha512-P3dLS+IerxCT/7D2q2FYcRdWRl22dNbrbBEtxdWhXrfIMPP9lQhb5h4Du04mdl5Woq05jVCDPCMF7Ub0NAjIew==",
       "cpu": [
         "ia32"
       ],
@@ -3853,9 +3859,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.55.1.tgz",
-      "integrity": "sha512-xGGY5pXj69IxKb4yv/POoocPy/qmEGhimy/FoTpTSVju3FYXUQQMFCaZZXJVidsmGxRioZAwpThl/4zX41gRKg==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.57.1.tgz",
+      "integrity": "sha512-VMBH2eOOaKGtIJYleXsi2B8CPVADrh+TyNxJ4mWPnKfLB/DBUmzW+5m1xUrcwWoMfSLagIRpjUFeW5CO5hyciQ==",
       "cpu": [
         "x64"
       ],
@@ -3867,9 +3873,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.55.1.tgz",
-      "integrity": "sha512-SPEpaL6DX4rmcXtnhdrQYgzQ5W2uW3SCJch88lB2zImhJRhIIK44fkUrgIV/Q8yUNfw5oyZ5vkeQsZLhCb06lw==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.57.1.tgz",
+      "integrity": "sha512-mxRFDdHIWRxg3UfIIAwCm6NzvxG0jDX/wBN6KsQFTvKFqqg9vTrWUE68qEjHt19A5wwx5X5aUi2zuZT7YR0jrA==",
       "cpu": [
         "x64"
       ],
@@ -3973,9 +3979,9 @@
       }
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.34.47",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.47.tgz",
-      "integrity": "sha512-ZGIBQ+XDvO5JQku9wmwtabcVTHJsgSWAHYtVuM9pBNNR5E88v6Jcj/llpmsjivig5X8A8HHOb4/mbEKPS5EvAw==",
+      "version": "0.34.48",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.48.tgz",
+      "integrity": "sha512-kKJTNuK3AQOrgjjotVxMrCn1sUJwM76wMszfq1kdU4uYVJjvEWuFQ6HgvLt4Xz3fSmZlTOxJ/Ie13KnIcWQXFA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4075,9 +4081,9 @@
       "license": "MIT"
     },
     "node_modules/@testing-library/react": {
-      "version": "16.3.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.1.tgz",
-      "integrity": "sha512-gr4KtAWqIOQoucWYD/f6ki+j5chXfcPc74Col/6poTyqTmn7zRmodWahWRCp8tYd+GMqBonw6hstNzqjbs6gjw==",
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
+      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4125,8 +4131,7 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -4347,9 +4352,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.8.tgz",
-      "integrity": "sha512-r0bBaXu5Swb05doFYO2kTWHMovJnNVbCsII0fhesM8bNRlLhXIuckley4a2DaD+vOdmm5G+zGkQZAPZsF80+YQ==",
+      "version": "24.10.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.9.tgz",
+      "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4382,11 +4387,12 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "19.2.7",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
-      "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
+      "version": "19.2.10",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.10.tgz",
+      "integrity": "sha512-WPigyYuGhgZ/cTPRXB2EwUw+XvsRA3GqHlsP4qteqrnnjDrApbS7MxcGr/hke5iUoeB7E/gQtrs9I37zAJ0Vjw==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -4397,6 +4403,7 @@
       "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "@types/react": "^19.2.0"
       }
@@ -4468,17 +4475,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.53.0.tgz",
-      "integrity": "sha512-eEXsVvLPu8Z4PkFibtuFJLJOTAV/nPdgtSjkGoPpddpFk3/ym2oy97jynY6ic2m6+nc5M8SE1e9v/mHKsulcJg==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.54.0.tgz",
+      "integrity": "sha512-hAAP5io/7csFStuOmR782YmTthKBJ9ND3WVL60hcOjvtGFb+HJxH4O5huAcmcZ9v9G8P+JETiZ/G1B8MALnWZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.12.2",
-        "@typescript-eslint/scope-manager": "8.53.0",
-        "@typescript-eslint/type-utils": "8.53.0",
-        "@typescript-eslint/utils": "8.53.0",
-        "@typescript-eslint/visitor-keys": "8.53.0",
+        "@typescript-eslint/scope-manager": "8.54.0",
+        "@typescript-eslint/type-utils": "8.54.0",
+        "@typescript-eslint/utils": "8.54.0",
+        "@typescript-eslint/visitor-keys": "8.54.0",
         "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^2.4.0"
@@ -4491,22 +4498,23 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.53.0",
+        "@typescript-eslint/parser": "^8.54.0",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.53.0.tgz",
-      "integrity": "sha512-npiaib8XzbjtzS2N4HlqPvlpxpmZ14FjSJrteZpPxGUaYPlvhzlzUZ4mZyABo0EFrOWnvyd0Xxroq//hKhtAWg==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.54.0.tgz",
+      "integrity": "sha512-BtE0k6cjwjLZoZixN0t5AKP0kSzlGu7FctRXYuPAm//aaiZhmfq1JwdYpYr1brzEspYyFeF+8XF5j2VK6oalrA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.53.0",
-        "@typescript-eslint/types": "8.53.0",
-        "@typescript-eslint/typescript-estree": "8.53.0",
-        "@typescript-eslint/visitor-keys": "8.53.0",
+        "@typescript-eslint/scope-manager": "8.54.0",
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/typescript-estree": "8.54.0",
+        "@typescript-eslint/visitor-keys": "8.54.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -4522,14 +4530,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.53.0.tgz",
-      "integrity": "sha512-Bl6Gdr7NqkqIP5yP9z1JU///Nmes4Eose6L1HwpuVHwScgDPPuEWbUVhvlZmb8hy0vX9syLk5EGNL700WcBlbg==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.54.0.tgz",
+      "integrity": "sha512-YPf+rvJ1s7MyiWM4uTRhE4DvBXrEV+d8oC3P9Y2eT7S+HBS0clybdMIPnhiATi9vZOYDc7OQ1L/i6ga6NFYK/g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.53.0",
-        "@typescript-eslint/types": "^8.53.0",
+        "@typescript-eslint/tsconfig-utils": "^8.54.0",
+        "@typescript-eslint/types": "^8.54.0",
         "debug": "^4.4.3"
       },
       "engines": {
@@ -4544,14 +4552,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.53.0.tgz",
-      "integrity": "sha512-kWNj3l01eOGSdVBnfAF2K1BTh06WS0Yet6JUgb9Cmkqaz3Jlu0fdVUjj9UI8gPidBWSMqDIglmEXifSgDT/D0g==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.54.0.tgz",
+      "integrity": "sha512-27rYVQku26j/PbHYcVfRPonmOlVI6gihHtXFbTdB5sb6qA0wdAQAbyXFVarQ5t4HRojIz64IV90YtsjQSSGlQg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.53.0",
-        "@typescript-eslint/visitor-keys": "8.53.0"
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/visitor-keys": "8.54.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4562,9 +4570,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.53.0.tgz",
-      "integrity": "sha512-K6Sc0R5GIG6dNoPdOooQ+KtvT5KCKAvTcY8h2rIuul19vxH5OTQk7ArKkd4yTzkw66WnNY0kPPzzcmWA+XRmiA==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.54.0.tgz",
+      "integrity": "sha512-dRgOyT2hPk/JwxNMZDsIXDgyl9axdJI3ogZ2XWhBPsnZUv+hPesa5iuhdYt2gzwA9t8RE5ytOJ6xB0moV0Ujvw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4579,15 +4587,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.53.0.tgz",
-      "integrity": "sha512-BBAUhlx7g4SmcLhn8cnbxoxtmS7hcq39xKCgiutL3oNx1TaIp+cny51s8ewnKMpVUKQUGb41RAUWZ9kxYdovuw==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.54.0.tgz",
+      "integrity": "sha512-hiLguxJWHjjwL6xMBwD903ciAwd7DmK30Y9Axs/etOkftC3ZNN9K44IuRD/EB08amu+Zw6W37x9RecLkOo3pMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.53.0",
-        "@typescript-eslint/typescript-estree": "8.53.0",
-        "@typescript-eslint/utils": "8.53.0",
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/typescript-estree": "8.54.0",
+        "@typescript-eslint/utils": "8.54.0",
         "debug": "^4.4.3",
         "ts-api-utils": "^2.4.0"
       },
@@ -4604,9 +4612,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.53.0.tgz",
-      "integrity": "sha512-Bmh9KX31Vlxa13+PqPvt4RzKRN1XORYSLlAE+sO1i28NkisGbTtSLFVB3l7PWdHtR3E0mVMuC7JilWJ99m2HxQ==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.54.0.tgz",
+      "integrity": "sha512-PDUI9R1BVjqu7AUDsRBbKMtwmjWcn4J3le+5LpcFgWULN3LvHC5rkc9gCVxbrsrGmO1jfPybN5s6h4Jy+OnkAA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4618,16 +4626,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.53.0.tgz",
-      "integrity": "sha512-pw0c0Gdo7Z4xOG987u3nJ8akL9093yEEKv8QTJ+Bhkghj1xyj8cgPaavlr9rq8h7+s6plUJ4QJYw2gCZodqmGw==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.54.0.tgz",
+      "integrity": "sha512-BUwcskRaPvTk6fzVWgDPdUndLjB87KYDrN5EYGetnktoeAvPtO4ONHlAZDnj5VFnUANg0Sjm7j4usBlnoVMHwA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.53.0",
-        "@typescript-eslint/tsconfig-utils": "8.53.0",
-        "@typescript-eslint/types": "8.53.0",
-        "@typescript-eslint/visitor-keys": "8.53.0",
+        "@typescript-eslint/project-service": "8.54.0",
+        "@typescript-eslint/tsconfig-utils": "8.54.0",
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/visitor-keys": "8.54.0",
         "debug": "^4.4.3",
         "minimatch": "^9.0.5",
         "semver": "^7.7.3",
@@ -4646,16 +4654,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.53.0.tgz",
-      "integrity": "sha512-XDY4mXTez3Z1iRDI5mbRhH4DFSt46oaIFsLg+Zn97+sYrXACziXSQcSelMybnVZ5pa1P6xYkPr5cMJyunM1ZDA==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.54.0.tgz",
+      "integrity": "sha512-9Cnda8GS57AQakvRyG0PTejJNlA2xhvyNtEVIMlDWOOeEyBkYWhGPnfrIAnqxLMTSTo6q8g12XVjjev5l1NvMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.9.1",
-        "@typescript-eslint/scope-manager": "8.53.0",
-        "@typescript-eslint/types": "8.53.0",
-        "@typescript-eslint/typescript-estree": "8.53.0"
+        "@typescript-eslint/scope-manager": "8.54.0",
+        "@typescript-eslint/types": "8.54.0",
+        "@typescript-eslint/typescript-estree": "8.54.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -4670,13 +4678,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.53.0.tgz",
-      "integrity": "sha512-LZ2NqIHFhvFwxG0qZeLL9DvdNAHPGCY5dIRwBhyYeU+LfLhcStE1ImjsuTG/WaVh3XysGaeLW8Rqq7cGkPCFvw==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.54.0.tgz",
+      "integrity": "sha512-VFlhGSl4opC0bprJiItPQ1RfUhGDIBokcPwaFH4yiBCaNPeld/9VeXbiPO1cLyorQi1G1vL+ecBk1x8o1axORA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.53.0",
+        "@typescript-eslint/types": "8.54.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -5207,6 +5215,7 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5710,6 +5719,7 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-1.0.0.tgz",
       "integrity": "sha512-Ixm8tFfoKKIPYdCCKYTsqv+Fd4IJ0DQqMyEimo+pxUOMUR9cVPlwTrFt9Avu+3cb6Zp3mAzl+t1MrG2fxxKsxw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/types": "^7.26.0"
       }
@@ -5766,9 +5776,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.9.14",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.14.tgz",
-      "integrity": "sha512-B0xUquLkiGLgHhpPBqvl7GWegWBUNuujQ6kXd/r1U38ElPT6Ok8KZ8e+FpUGEc2ZoRQUzq/aUnaKFc/svWUGSg==",
+      "version": "2.9.19",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
+      "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
       "license": "Apache-2.0",
       "bin": {
         "baseline-browser-mapping": "dist/cli.js"
@@ -5834,6 +5844,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -6007,9 +6018,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001764",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001764.tgz",
-      "integrity": "sha512-9JGuzl2M+vPL+pz70gtMF9sHdMFbY9FJaQBi186cHKH3pSzDvzoUJUPV6fqiKIMyXbud9ZLg4F3Yza1vJ1+93g==",
+      "version": "1.0.30001766",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
+      "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
       "funding": [
         {
           "type": "opencollective",
@@ -6093,9 +6104,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
-      "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
+      "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
       "dev": true,
       "funding": [
         {
@@ -6590,9 +6601,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.47.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.47.0.tgz",
-      "integrity": "sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==",
+      "version": "3.48.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.48.0.tgz",
+      "integrity": "sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -7012,8 +7023,7 @@
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/dot-prop": {
       "version": "5.3.0",
@@ -7171,9 +7181,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.267",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz",
-      "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==",
+      "version": "1.5.283",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.283.tgz",
+      "integrity": "sha512-3vifjt1HgrGW/h76UEeny+adYApveS9dH2h3p57JYzBSXJIKUJAvtmIytDKjcSCt9xHfrNCFJ7gts6vkhuq++w==",
       "dev": true,
       "license": "ISC"
     },
@@ -7480,6 +7490,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -7535,13 +7546,13 @@
       }
     },
     "node_modules/eslint-config-next": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-16.1.1.tgz",
-      "integrity": "sha512-55nTpVWm3qeuxoQKLOjQVciKZJUphKrNM0fCcQHAIOGl6VFXgaqeMfv0aKJhs7QtcnlAPhNVqsqRfRjeKBPIUA==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-16.1.6.tgz",
+      "integrity": "sha512-vKq40io2B0XtkkNDYyleATwblNt8xuh3FWp8SpSz3pt7P01OkBFlKsJZ2mWt5WsCySlDQLckb1zMY9yE9Qy0LA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@next/eslint-plugin-next": "16.1.1",
+        "@next/eslint-plugin-next": "16.1.6",
         "eslint-import-resolver-node": "^0.3.6",
         "eslint-import-resolver-typescript": "^3.5.2",
         "eslint-plugin-import": "^2.32.0",
@@ -7665,6 +7676,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -7805,9 +7817,9 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc/node_modules/espree": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-11.0.0.tgz",
-      "integrity": "sha512-+gMeWRrIh/NsG+3NaLeWHuyeyk70p2tbvZIWBYcqQ4/7Xvars6GYTZNhF1sIeLcc6Wb11He5ffz3hsHyXFrw5A==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.1.0.tgz",
+      "integrity": "sha512-WFWYhO1fV4iYkqOOvq8FbqIhr2pYfoDY0kCotMkDeNtGpiGGkZ1iov2u8ydjtgM8yF8rzK7oaTbw2NAzbAbehw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -8850,9 +8862,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.0.tgz",
-      "integrity": "sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==",
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.1.tgz",
+      "integrity": "sha512-EoY1N2xCn44xU6750Sx7OjOIT59FkmstNc3X6y5xpz7D5cBtZRe/3pSlTkDJgqsOk3WwZPkWfonhhUJfttQo3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10221,6 +10233,7 @@
       "integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jest/core": "30.2.0",
         "@jest/types": "30.2.0",
@@ -11272,6 +11285,7 @@
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -11612,9 +11626,9 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
       "dev": true,
       "license": "MIT"
     },
@@ -11673,7 +11687,6 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
@@ -11735,10 +11748,11 @@
       }
     },
     "node_modules/mapbox-gl": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.17.0.tgz",
-      "integrity": "sha512-nCrDKRlr5di6xUksUDslNWwxroJ5yv1hT8pyVFtcpWJOOKsYQxF/wOFTMie8oxMnXeFkrz1Tl1TwA1XN1yX0KA==",
+      "version": "3.18.1",
+      "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-3.18.1.tgz",
+      "integrity": "sha512-Izc8dee2zkmb6Pn9hXFbVioPRLXJz1OFUcrvri69MhFACPU4bhLyVmhEsD9AyW1qOAP0Yvhzm60v63xdMIHPPw==",
       "license": "SEE LICENSE IN LICENSE.txt",
+      "peer": true,
       "workspaces": [
         "src/style-spec",
         "test/build/vite",
@@ -11765,7 +11779,7 @@
         "gl-matrix": "^3.4.4",
         "grid-index": "^1.1.0",
         "kdbush": "^4.0.2",
-        "martinez-polygon-clipping": "^0.7.4",
+        "martinez-polygon-clipping": "^0.8.1",
         "murmurhash-js": "^1.0.0",
         "pbf": "^4.0.1",
         "potpack": "^2.0.0",
@@ -11775,22 +11789,16 @@
       }
     },
     "node_modules/martinez-polygon-clipping": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/martinez-polygon-clipping/-/martinez-polygon-clipping-0.7.4.tgz",
-      "integrity": "sha512-jBEwrKtA0jTagUZj2bnmb4Yg2s4KnJGRePStgI7bAVjtcipKiF39R4LZ2V/UT61jMYWrTcBhPazexeqd6JAVtw==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/martinez-polygon-clipping/-/martinez-polygon-clipping-0.8.1.tgz",
+      "integrity": "sha512-9PLLMzMPI6ihHox4Ns6LpVBLpRc7sbhULybZ/wyaY8sY3ECNe2+hxm1hA2/9bEEpRrdpjoeduBuZLg2aq1cSIQ==",
       "license": "MIT",
       "dependencies": {
         "robust-predicates": "^2.0.4",
         "splaytree": "^0.1.4",
-        "tinyqueue": "^1.2.0"
+        "tinyqueue": "3.0.0"
       }
     },
-    "node_modules/martinez-polygon-clipping/node_modules/tinyqueue": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-1.2.3.tgz",
-      "integrity": "sha512-Qz9RgWuO9l8lT+Y9xvbzhPT2efIUIFd69N7eF7tJ9lnQl0iLj1M7peK7IoUGZL9DJHw9XftqLreccfxcQgYLxA==",
-      "license": "ISC"
-    },
     "node_modules/matcher": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
@@ -12209,12 +12217,13 @@
       "license": "MIT"
     },
     "node_modules/next": {
-      "version": "16.1.1",
-      "resolved": "https://registry.npmjs.org/next/-/next-16.1.1.tgz",
-      "integrity": "sha512-QI+T7xrxt1pF6SQ/JYFz95ro/mg/1Znk5vBebsWwbpejj1T0A23hO7GYEaVac9QUOT2BIMiuzm0L99ooq7k0/w==",
+      "version": "16.1.6",
+      "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz",
+      "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@next/env": "16.1.1",
+        "@next/env": "16.1.6",
         "@swc/helpers": "0.5.15",
         "baseline-browser-mapping": "^2.8.3",
         "caniuse-lite": "^1.0.30001579",
@@ -12228,14 +12237,14 @@
         "node": ">=20.9.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "16.1.1",
-        "@next/swc-darwin-x64": "16.1.1",
-        "@next/swc-linux-arm64-gnu": "16.1.1",
-        "@next/swc-linux-arm64-musl": "16.1.1",
-        "@next/swc-linux-x64-gnu": "16.1.1",
-        "@next/swc-linux-x64-musl": "16.1.1",
-        "@next/swc-win32-arm64-msvc": "16.1.1",
-        "@next/swc-win32-x64-msvc": "16.1.1",
+        "@next/swc-darwin-arm64": "16.1.6",
+        "@next/swc-darwin-x64": "16.1.6",
+        "@next/swc-linux-arm64-gnu": "16.1.6",
+        "@next/swc-linux-arm64-musl": "16.1.6",
+        "@next/swc-linux-x64-gnu": "16.1.6",
+        "@next/swc-linux-x64-musl": "16.1.6",
+        "@next/swc-win32-arm64-msvc": "16.1.6",
+        "@next/swc-win32-x64-msvc": "16.1.6",
         "sharp": "^0.34.4"
       },
       "peerDependencies": {
@@ -12729,9 +12738,9 @@
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "11.2.4",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
-      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
+      "version": "11.2.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.5.tgz",
+      "integrity": "sha512-vFrFJkWtJvJnD5hg+hJvVE8Lh/TcMzKnTgCWmtBipwI5yLX/iX+5UB2tfuyODF5E7k9xEzMdYgGqaSb1c0c5Yw==",
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": "20 || >=22"
@@ -12890,13 +12899,13 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.57.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz",
-      "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==",
+      "version": "1.58.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.1.tgz",
+      "integrity": "sha512-+2uTZHxSCcxjvGc5C891LrS1/NlxglGxzrC4seZiVjcYVQfUa87wBL6rTDqzGjuoWNjnBzRqKmF6zRYGMvQUaQ==",
       "devOptional": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.57.0"
+        "playwright-core": "1.58.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -12909,9 +12918,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.57.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz",
-      "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==",
+      "version": "1.58.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.1.tgz",
+      "integrity": "sha512-bcWzOaTxcW+VOOGBCQgnaKToLJ65d6AqfLVKEWvexyS3AS6rbXl+xdpYRMGSRBClPvyj44njOWoxjNdL/H9UNg==",
       "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
@@ -13003,7 +13012,6 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -13018,7 +13026,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -13030,8 +13037,7 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
@@ -13172,24 +13178,26 @@
       "license": "MIT"
     },
     "node_modules/react": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
-      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
+      "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
+      "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.3"
+        "react": "^19.2.4"
       }
     },
     "node_modules/react-image-gallery": {
@@ -13202,9 +13210,9 @@
       }
     },
     "node_modules/react-is": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.3.tgz",
-      "integrity": "sha512-qJNJfu81ByyabuG7hPFEbXqNcWSU3+eVus+KJs+0ncpGfMyYdvSmxiJxbWR65lYi1I+/0HBcliO029gc4F+PnA==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-19.2.4.tgz",
+      "integrity": "sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA==",
       "license": "MIT"
     },
     "node_modules/react-map-gl": {
@@ -13442,7 +13450,8 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
       "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
@@ -13694,9 +13703,9 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.55.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.55.1.tgz",
-      "integrity": "sha512-wDv/Ht1BNHB4upNbK74s9usvl7hObDnvVzknxqY/E/O3X6rW1U1rV1aENEfJ54eFZDTNo7zv1f5N4edCluH7+A==",
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
+      "integrity": "sha512-oQL6lgK3e2QZeQ7gcgIkS2YZPg5slw37hYufJ3edKlfQSGGm8ICoxswK15ntSzF/a8+h7ekRy7k7oWc3BQ7y8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13710,31 +13719,31 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.55.1",
-        "@rollup/rollup-android-arm64": "4.55.1",
-        "@rollup/rollup-darwin-arm64": "4.55.1",
-        "@rollup/rollup-darwin-x64": "4.55.1",
-        "@rollup/rollup-freebsd-arm64": "4.55.1",
-        "@rollup/rollup-freebsd-x64": "4.55.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.55.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.55.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.55.1",
-        "@rollup/rollup-linux-arm64-musl": "4.55.1",
-        "@rollup/rollup-linux-loong64-gnu": "4.55.1",
-        "@rollup/rollup-linux-loong64-musl": "4.55.1",
-        "@rollup/rollup-linux-ppc64-gnu": "4.55.1",
-        "@rollup/rollup-linux-ppc64-musl": "4.55.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.55.1",
-        "@rollup/rollup-linux-riscv64-musl": "4.55.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.55.1",
-        "@rollup/rollup-linux-x64-gnu": "4.55.1",
-        "@rollup/rollup-linux-x64-musl": "4.55.1",
-        "@rollup/rollup-openbsd-x64": "4.55.1",
-        "@rollup/rollup-openharmony-arm64": "4.55.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.55.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.55.1",
-        "@rollup/rollup-win32-x64-gnu": "4.55.1",
-        "@rollup/rollup-win32-x64-msvc": "4.55.1",
+        "@rollup/rollup-android-arm-eabi": "4.57.1",
+        "@rollup/rollup-android-arm64": "4.57.1",
+        "@rollup/rollup-darwin-arm64": "4.57.1",
+        "@rollup/rollup-darwin-x64": "4.57.1",
+        "@rollup/rollup-freebsd-arm64": "4.57.1",
+        "@rollup/rollup-freebsd-x64": "4.57.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.57.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.57.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.57.1",
+        "@rollup/rollup-linux-arm64-musl": "4.57.1",
+        "@rollup/rollup-linux-loong64-gnu": "4.57.1",
+        "@rollup/rollup-linux-loong64-musl": "4.57.1",
+        "@rollup/rollup-linux-ppc64-gnu": "4.57.1",
+        "@rollup/rollup-linux-ppc64-musl": "4.57.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.57.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.57.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.57.1",
+        "@rollup/rollup-linux-x64-gnu": "4.57.1",
+        "@rollup/rollup-linux-x64-musl": "4.57.1",
+        "@rollup/rollup-openbsd-x64": "4.57.1",
+        "@rollup/rollup-openharmony-arm64": "4.57.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.57.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.57.1",
+        "@rollup/rollup-win32-x64-gnu": "4.57.1",
+        "@rollup/rollup-win32-x64-msvc": "4.57.1",
         "fsevents": "~2.3.2"
       }
     },
@@ -14164,9 +14173,9 @@
       }
     },
     "node_modules/snyk": {
-      "version": "1.1301.2",
-      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1301.2.tgz",
-      "integrity": "sha512-FUTV/2WStY0GyvJROvxKPa2A3FzgVNIUB8rR2LMiR1to9onrnyO233HEIOS1HU+dJTXHFSh8z3fMze2TqPt58w==",
+      "version": "1.1302.1",
+      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1302.1.tgz",
+      "integrity": "sha512-RT85Pz4N36xma7Mcob0Jno5TXu22VbVoT+7mWHk2TVkBHqsMZ8sKW55X+r+LMaT8GwlC5+cYjzw2iuv1VcPZOg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -14963,9 +14972,9 @@
       "license": "MIT"
     },
     "node_modules/synckit": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.11.tgz",
-      "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==",
+      "version": "0.11.12",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.12.tgz",
+      "integrity": "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -15126,6 +15135,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15399,6 +15409,7 @@
       "integrity": "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "~0.27.0",
         "get-tsconfig": "^4.7.5"
@@ -15558,6 +15569,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -15567,16 +15579,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.53.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.53.0.tgz",
-      "integrity": "sha512-xHURCQNxZ1dsWn0sdOaOfCSQG0HKeqSj9OexIxrz6ypU6wHYOdX2I3D2b8s8wFSsSOYJb+6q283cLiLlkEsBYw==",
+      "version": "8.54.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.54.0.tgz",
+      "integrity": "sha512-CKsJ+g53QpsNPqbzUsfKVgd3Lny4yKZ1pP4qN3jdMOg/sisIDLGyDMezycquXLE5JsEU0wp3dGNdzig0/fmSVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.53.0",
-        "@typescript-eslint/parser": "8.53.0",
-        "@typescript-eslint/typescript-estree": "8.53.0",
-        "@typescript-eslint/utils": "8.53.0"
+        "@typescript-eslint/eslint-plugin": "8.54.0",
+        "@typescript-eslint/parser": "8.54.0",
+        "@typescript-eslint/typescript-estree": "8.54.0",
+        "@typescript-eslint/utils": "8.54.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -15879,6 +15891,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -15990,24 +16003,6 @@
         }
       }
     },
-    "node_modules/vite-node/node_modules/yaml": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
-      "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
     "node_modules/vitest": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
@@ -16132,6 +16127,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -16174,6 +16170,7 @@
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -16243,24 +16240,6 @@
         }
       }
     },
-    "node_modules/vitest/node_modules/yaml": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
-      "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
     "node_modules/w3c-xmlserializer": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
@@ -16416,9 +16395,9 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "version": "1.1.20",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
+      "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -16692,10 +16671,11 @@
       }
     },
     "node_modules/zod": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.5.tgz",
-      "integrity": "sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
+      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index 728be05a..6d81b3a5 100644
--- a/package.json
+++ b/package.json
@@ -28,39 +28,39 @@
     "glob": "^13.0.0",
     "h3-js": "^4.4.0",
     "heic-convert": "^2.1.0",
-    "mapbox-gl": "^3.17.0",
+    "mapbox-gl": "^3.18.1",
     "mime-types": "^3.0.2",
-    "next": "16.1.1",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "next": "^16.1.6",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
     "react-image-gallery": "^1.4.0",
     "react-map-gl": "^8.1.0",
     "sharp": "^0.34.5",
     "stylis": "^4.3.6",
     "swr": "^2.3.8",
     "xml2js": "^0.6.2",
-    "zod": "^4.3.5"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@eslint/js": "^9.28.0",
-    "@next/eslint-plugin-next": "16.1.1",
-    "@playwright/test": "^1.57.0",
+    "@next/eslint-plugin-next": "^16.1.1",
+    "@playwright/test": "^1.58.1",
     "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.1",
+    "@testing-library/react": "^16.3.2",
     "@types/boom": "^7.3.5",
     "@types/geojson": "^7946.0.16",
     "@types/heic-convert": "^2.1.0",
     "@types/jest": "^30.0.0",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^24.10.8",
-    "@types/react": "19.2.7",
+    "@types/node": "^24.10.9",
+    "@types/react": "19.2.10",
     "@types/react-dom": "19.2.3",
     "@types/react-image-gallery": "^1.2.4",
     "@types/xml2js": "^0.4.14",
     "@typescript-eslint/eslint-plugin": "^8.48.1",
     "@typescript-eslint/parser": "^8.48.1",
     "eslint": "^9.39.2",
-    "eslint-config-next": "16.1.1",
+    "eslint-config-next": "^16.1.6",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-jsdoc": "^61.7.1",
@@ -69,7 +69,7 @@
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
     "next-test-api-route-handler": "^5.0.3",
-    "snyk": "^1.1301.2",
+    "snyk": "^1.1302.1",
     "standard-version": "^9.5.0",
     "ts-jest": "^29.4.6",
     "tsx": "^4.21.0",
@@ -85,7 +85,7 @@
     "@testing-library/dom": "^10.4.1"
   },
   "overrides": {
-    "@types/react": "19.2.7",
+    "@types/react": "19.2.10",
     "@types/react-dom": "19.2.3"
   }
 }
diff --git a/src/components/Albums/index.tsx b/src/components/Albums/index.tsx
index a29a9c3c..e13bfaa6 100644
--- a/src/components/Albums/index.tsx
+++ b/src/components/Albums/index.tsx
@@ -12,7 +12,7 @@ interface InputProps {
 function Galleries({ items, gallery }: InputProps) {
   const { width, height } = config.resizeDimensions.thumb
   return items.map((album) => (
-    <div key={album.name} className={styles.albums}>
+    <div data-type="gallery" key={album.name} className={styles.albums}>
       <Link href={`/${gallery}/${album.name}`}>
         <Img src={album.thumbPath} alt={album.name} width={width} height={height} />
       </Link>

From bf6de1ce62ebd8f3463a48cacd41a6c09701cb02 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 31 Jan 2026 11:52:03 -0800
Subject: [PATCH 30/33] Apply best practices

---
 .../AdminAlbum/AdminAlbumClient.tsx           |  8 +----
 src/components/AdminAlbum/Fields.tsx          |  1 +
 src/components/AdminAlbum/useGeoCopy.tsx      |  1 +
 src/components/SplitViewer/index.tsx          |  2 +-
 src/hooks/useMemory.tsx                       |  2 +-
 src/hooks/useSearch.tsx                       | 34 +++++++------------
 src/lib/paths.ts                              | 23 ++++---------
 src/lib/xml.ts                                |  2 +-
 src/utils/reference.ts                        |  5 ++-
 9 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index 31811083..cfcedffc 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -31,7 +31,6 @@ export default function AdminAlbumClient(
   const [currentIndex, setCurrentIndex] = useState<number>(-1)
   const [selectedIndices, setSelectedIndices] = useState<Set<number>>(new Set())
   const [searchQuery, setSearchQuery] = useState<string>('')
-  const [searchResults, setSearchResults] = useState<SearchResult[]>([])
   const [isSearching, setIsSearching] = useState(false)
   const {
     EditCountPill,
@@ -198,7 +197,6 @@ export default function AdminAlbumClient(
       const data: { results: SearchResult[] } = await response.json()
 
       if (data.results && data.results.length > 0) {
-        setSearchResults(data.results)
         // Load the first result automatically
         const firstResult = data.results[0]
         setCurrentGallery(firstResult.gallery)
@@ -206,11 +204,7 @@ export default function AdminAlbumClient(
         const selectedAlbum = galleryAlbum[firstResult.gallery].albums.find(a => a.name === firstResult.album)
         if (selectedAlbum) {
           setAlbum(selectedAlbum)
-          // Wait for the album to load, then select the item
-          setTimeout(async () => {
-            await mutate()
-            setCurrentIndex(firstResult.index)
-          }, 100)
+          setCurrentIndex(firstResult.index)
         }
       } else {
         alert('No matching files found')
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 0c1cfc86..60a79751 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -319,6 +319,7 @@ export default function Fields(
             }}
             disabled={!editedItem?.ref?.source || !editedItem?.ref?.name}
             title="Copy reference URL to clipboard"
+            aria-label="Copy reference URL to clipboard"
             sx={{ minWidth: 'auto', px: 1 }}
           >
             📋
diff --git a/src/components/AdminAlbum/useGeoCopy.tsx b/src/components/AdminAlbum/useGeoCopy.tsx
index 60a48889..dc72fe04 100644
--- a/src/components/AdminAlbum/useGeoCopy.tsx
+++ b/src/components/AdminAlbum/useGeoCopy.tsx
@@ -30,6 +30,7 @@ export function useGeoCopy(editedItem: RawXmlItem | null) {
       onClick={copyGeoCoordinates}
       disabled={disabled}
       title={title}
+      aria-label={title}
       sx={{ minWidth: 'auto', px: 1 }}
     >
       📋
diff --git a/src/components/SplitViewer/index.tsx b/src/components/SplitViewer/index.tsx
index 5f5fb64a..780fef83 100644
--- a/src/components/SplitViewer/index.tsx
+++ b/src/components/SplitViewer/index.tsx
@@ -128,7 +128,7 @@ function SplitViewer({
         coordinates: clearCoordinates,
       } as Item)
     }
-  }, [isClearing, clearCoordinates])
+  }, [isClearing, clearCoordinates, dynamicCentroid])
 
   // Update locked centroid during normal navigation only
   useEffect(() => {
diff --git a/src/hooks/useMemory.tsx b/src/hooks/useMemory.tsx
index 33b48109..31d5847f 100644
--- a/src/hooks/useMemory.tsx
+++ b/src/hooks/useMemory.tsx
@@ -61,7 +61,7 @@ const useMemory = (
         {Array.isArray(details.filename) ? details.filename.join(', ') : String(details.filename)}
       </h5>
       {details.reference && details.reference.length >= 2 && (
-        <Link href={details.reference[0]} target='_blank'>
+        <Link href={details.reference[0]} target='_blank' rel="noopener noreferrer">
           {decodeURI(details.reference[1]).replaceAll('_', ' ')}
         </Link>
       )}
diff --git a/src/hooks/useSearch.tsx b/src/hooks/useSearch.tsx
index 40827155..09c8ce91 100644
--- a/src/hooks/useSearch.tsx
+++ b/src/hooks/useSearch.tsx
@@ -63,13 +63,10 @@ export default function useSearch<ItemType extends ServerSideItem>({
     setVisibleCount((prev) => (prev === count ? prev : count))
   }, [])
 
-  // Adjust visibleCount when filtered items change during render
-  // This avoids a double render caused by useEffect synchronization
-  const [prevFiltered, setPrevFiltered] = useState(filtered)
-  if (filtered !== prevFiltered) {
-    setPrevFiltered(filtered)
-    setVisibleCount(filtered.length)
-  }
+  // Sync visibleCount when filtered items change (avoids state-update-during-render)
+  useEffect(() => {
+    setVisibleCount((prev) => (prev === filtered.length ? prev : filtered.length))
+  }, [filtered.length])
 
   const handleSubmit = useCallback((event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault()
@@ -84,19 +81,14 @@ export default function useSearch<ItemType extends ServerSideItem>({
     const currentIndex = refImageGallery?.current?.getCurrentIndex?.() ?? 0
     const itemsToUse = displayedItems || filtered
     const currentItem = itemsToUse[currentIndex]
-    if (!currentItem) return
-
-    // Use filename as unique identifier (works across all albums)
-    const identifier = Array.isArray((currentItem as any).filename)
-      ? (currentItem as any).filename[0]
-      : (currentItem as any).filename
-    if (!identifier) return
-
-    // Extract coordinates from current item
-    const coordinates = (currentItem as any).coordinates as [number, number] | null
-
-    // Set selectedId with clear flag for immediate processing
-    if (selectById) {
+    const identifier = currentItem
+      ? (Array.isArray((currentItem as any).filename)
+          ? (currentItem as any).filename[0]
+          : (currentItem as any).filename)
+      : null
+    const coordinates = (currentItem as any)?.coordinates as [number, number] | null
+
+    if (selectById && identifier) {
       selectById(identifier, true)
     }
 
@@ -111,7 +103,7 @@ export default function useSearch<ItemType extends ServerSideItem>({
     }
 
     // Update URL to reflect the selection (use filename for global uniqueness)
-    router.replace(`${pathname}?select=${identifier}`)
+    router.replace(identifier ? `${pathname}?select=${identifier}` : pathname)
   }, [refImageGallery, displayedItems, filtered, selectById, mapFilterEnabled, onClearMapFilter, router, pathname])
 
   const { BookmarkButton } = useBookmark({
diff --git a/src/lib/paths.ts b/src/lib/paths.ts
index ab634bfe..8ece8eeb 100644
--- a/src/lib/paths.ts
+++ b/src/lib/paths.ts
@@ -1,21 +1,12 @@
 import type { Gallery, Item, XmlItem } from '../types/common'
 
-const type = (filepath: string): string => {
-  const lastDot = filepath.lastIndexOf('.')
-  if (lastDot === 0) {
-    return filepath.substring(1)
-  }
-  if (lastDot === -1) {
-    return ''
-  }
-  return filepath.substring(lastDot + 1)
-}
-
 const filenameAsJpg = (filename: Item['filename'][0]) => {
-  const currentExt = type(filename)
+  const lastDot = filename.lastIndexOf('.')
+  if (lastDot === -1) return `${filename}.jpg`
+  const base = filename.slice(0, lastDot)
+  const currentExt = filename.slice(lastDot + 1)
   const futureExt = (currentExt.toLowerCase() === 'jpg' || currentExt.toLowerCase() === 'jpeg') ? currentExt : 'jpg'
-  const imageFilename = filename.replace(currentExt, futureExt)
-  return imageFilename
+  return `${base}.${futureExt}`
 }
 
 /**
@@ -27,7 +18,7 @@ const filenameAsJpg = (filename: Item['filename'][0]) => {
  */
 export const rasterPath = (filename: XmlItem['filename'], gallery: Gallery, rasterType: 'photo' | 'thumb') => {
   const imageFilename = filenameAsJpg(Array.isArray(filename) ? filename[0] : filename)
-  const year = imageFilename.indexOf('-') >= 0 && imageFilename.split('-')[0]
+  const year = imageFilename.indexOf('-') >= 0 ? imageFilename.split('-')[0] : ''
 
   return `/galleries/${gallery}/media/${rasterType}s/${year}/${imageFilename}`
 }
@@ -52,7 +43,7 @@ export const getVideoPaths = (filename: XmlItem['filename'], gallery: Gallery) =
   const filenames = Array.isArray(filename) ? filename : [filename]
 
   return filenames.map(fn => {
-    const year = fn.indexOf('-') >= 0 && fn.split('-')[0]
+    const year = fn.indexOf('-') >= 0 ? fn.split('-')[0] : ''
     return `/galleries/${gallery}/media/videos/${year}/${fn}`
   })
 }
diff --git a/src/lib/xml.ts b/src/lib/xml.ts
index 4779f8b4..37b0f791 100644
--- a/src/lib/xml.ts
+++ b/src/lib/xml.ts
@@ -16,7 +16,7 @@ async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: stri
 async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string, options: ParserOptions): Promise<RawXmlAlbum>
 async function readAlbum(gallery: NonNullable<AlbumMeta['gallery']>, album: string, options?: ParserOptions): Promise<XmlAlbum | RawXmlAlbum> {
   const fileBuffer = await fs.readFile(`public/galleries/${gallery}/${album}.xml`)
-  const selectedParser = options ? new xml2js.Parser(options) : parser
+  const selectedParser = options === rawParseOptions ? rawParser : (options ? new xml2js.Parser(options) : parser)
   return selectedParser.parseStringPromise(fileBuffer)
 }
 
diff --git a/src/utils/reference.ts b/src/utils/reference.ts
index 520b7527..d7f71b82 100644
--- a/src/utils/reference.ts
+++ b/src/utils/reference.ts
@@ -1,6 +1,6 @@
 import type { ItemReferenceSource, XmlItem } from '../types/common'
 
-export function buildReferenceUrl(source: ItemReferenceSource, name: string): string | null {
+export function buildReferenceUrl(source: ItemReferenceSource, name: string): string {
   const baseUrls: Record<ItemReferenceSource, string> = {
     facebook: 'https://www.facebook.com/',
     google: 'https://www.google.com/search?q=',
@@ -9,7 +9,7 @@ export function buildReferenceUrl(source: ItemReferenceSource, name: string): st
     youtube: 'https://www.youtube.com/watch?v=',
   }
 
-  return baseUrls[source] + name
+  return baseUrls[source] + encodeURIComponent(name)
 }
 
 export function transformReference(ref: XmlItem['ref']): [string, string] | null {
@@ -18,7 +18,6 @@ export function transformReference(ref: XmlItem['ref']): [string, string] | null
   }
   if ('name' in ref && 'source' in ref) {
     const url = buildReferenceUrl(ref.source, ref.name)
-    if (!url) return null
     return [url, ref.name]
   }
   return null

From ff28617f64df84261a04465045c1cb09d95aed30 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Sat, 31 Jan 2026 12:06:39 -0800
Subject: [PATCH 31/33] feat(Admin > Edit Album): View photo in new tab as
 original dimensions

---
 src/components/AdminAlbum/Photo.tsx | 44 +++++++++++++++++++++++------
 src/lib/paths.ts                    |  9 ++++--
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/components/AdminAlbum/Photo.tsx b/src/components/AdminAlbum/Photo.tsx
index 168c5931..d23e2dfc 100644
--- a/src/components/AdminAlbum/Photo.tsx
+++ b/src/components/AdminAlbum/Photo.tsx
@@ -1,14 +1,23 @@
 import Button from '@mui/joy/Button'
+import IconButton from '@mui/joy/IconButton'
 import Stack from '@mui/joy/Stack'
 import useSWRMutation from 'swr/mutation'
 
 import type { Prediction } from '../../../app/api/admin/classify/route'
-import { photoPath } from '../../lib/paths'
+import { originalPath, photoPath } from '../../lib/paths'
 import config from '../../models/config'
 import type { Gallery, RawXmlItem } from '../../types/common'
 import Img from '../Img'
 import Link from '../Link'
 
+function OpenInNewIcon() {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="currentColor" aria-hidden>
+      <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z" />
+    </svg>
+  )
+}
+
 const fetcher = async (url: string, { arg }: { arg: string }) =>
   fetch(url, {
     method: 'POST',
@@ -25,22 +34,39 @@ export default function AdminAlbumPhoto(
     fetcher,
   )
 
-  const path = photoPath(item.filename, gallery)
+  const photoSrc = photoPath(item.filename, gallery)
+  const originalSrc = originalPath(item.filename, gallery)
   const dimensions = size === 'small' ? config.resizeDimensions.preview : config.resizeDimensions.photo
 
   return (
     <>
       <Stack direction="column">
-        <Img
-          src={path}
-          alt={item.thumb_caption || 'Photo'}
-          width={dimensions.width - 20}
-          height={dimensions.height - 20}
-        />
+        <Stack direction="row" alignItems="flex-start" spacing={1} sx={{ position: 'relative' }}>
+          <Img
+            src={photoSrc}
+            alt={item.thumb_caption || 'Photo'}
+            width={dimensions.width - 20}
+            height={dimensions.height - 20}
+          />
+          <IconButton
+            component={Link}
+            href={originalSrc}
+            target="_blank"
+            rel="noopener noreferrer"
+            variant="soft"
+            color="primary"
+            size="sm"
+            title="Open original image in new tab"
+            aria-label="Open original image in new tab"
+            sx={{ flexShrink: 0, mt: 0.5 }}
+          >
+            <OpenInNewIcon />
+          </IconButton>
+        </Stack>
         <Button
           onClick={(e) => {
             e.preventDefault()
-            trigger(path)
+            trigger(photoSrc)
           }}
         >
           Classify Image
diff --git a/src/lib/paths.ts b/src/lib/paths.ts
index 8ece8eeb..f51d7744 100644
--- a/src/lib/paths.ts
+++ b/src/lib/paths.ts
@@ -16,7 +16,7 @@ const filenameAsJpg = (filename: Item['filename'][0]) => {
  * @param {string} rasterType photo|thumb
  * @returns {string} path
  */
-export const rasterPath = (filename: XmlItem['filename'], gallery: Gallery, rasterType: 'photo' | 'thumb') => {
+export const rasterPath = (filename: XmlItem['filename'], gallery: Gallery, rasterType: 'original' | 'photo' | 'thumb') => {
   const imageFilename = filenameAsJpg(Array.isArray(filename) ? filename[0] : filename)
   const year = imageFilename.indexOf('-') >= 0 ? imageFilename.split('-')[0] : ''
 
@@ -29,10 +29,15 @@ export const rasterPath = (filename: XmlItem['filename'], gallery: Gallery, rast
 export const thumbPath = (filename: XmlItem['filename'], gallery: Gallery) => rasterPath(filename, gallery, 'thumb')
 
 /**
- * Photo path to public folder
+ * Photo path to public folder (resized for display)
  */
 export const photoPath = (filename: XmlItem['filename'], gallery: Gallery) => rasterPath(filename, gallery, 'photo')
 
+/**
+ * Original (full-size) image path to public folder
+ */
+export const originalPath = (filename: XmlItem['filename'], gallery: Gallery) => rasterPath(filename, gallery, 'original')
+
 /**
  * Video paths to public folder on local filesystem
  * @param {object} filename file plus extension

From 9dfe69f58512d64f9ead3356650901c8ad700170 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 3 Feb 2026 18:11:51 -0800
Subject: [PATCH 32/33] feat(Admin > Edit Album): Toggle photo or video

---
 .../AdminAlbum/AdminAlbumClient.tsx           |  6 +--
 src/components/AdminAlbum/Fields.tsx          | 44 ++++++++++++++++---
 .../AdminAlbum/useEditCountPill.tsx           | 42 ++++++++++++++----
 src/hooks/useMemory.tsx                       |  4 +-
 4 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/src/components/AdminAlbum/AdminAlbumClient.tsx b/src/components/AdminAlbum/AdminAlbumClient.tsx
index cfcedffc..9d4b8f99 100644
--- a/src/components/AdminAlbum/AdminAlbumClient.tsx
+++ b/src/components/AdminAlbum/AdminAlbumClient.tsx
@@ -58,14 +58,12 @@ export default function AdminAlbumClient(
 
   const handleItemUpdateWrapper = (updatedItem: RawXmlItem) => {
     // If multiple items are selected, apply the update to all of them
-    // preserving their specific ID and filename
-    if (selectedIndices.size > 0) {
+    // preserving their specific ID and filename (each keeps its own filename)
+    if (selectedIndices.size > 1) {
       selectedIndices.forEach(index => {
         const targetItem = items[index]
         if (!targetItem) return
 
-        // Create a new item that is a copy of the updated item
-        // but restores the target's ID and filename
         const newItem = {
           ...updatedItem,
           $: targetItem.$,
diff --git a/src/components/AdminAlbum/Fields.tsx b/src/components/AdminAlbum/Fields.tsx
index 60a79751..8ce1eb3b 100644
--- a/src/components/AdminAlbum/Fields.tsx
+++ b/src/components/AdminAlbum/Fields.tsx
@@ -1,4 +1,5 @@
 import Button from '@mui/joy/Button'
+import Checkbox from '@mui/joy/Checkbox'
 import IconButton from '@mui/joy/IconButton'
 import Input from '@mui/joy/Input'
 import Option from '@mui/joy/Option'
@@ -67,6 +68,7 @@ export default function Fields(
   const allKeywords = keywordsData?.keywords ?? []
 
   useEffect(() => {
+    if (updatePendingRef.current) return
     setEditedItem(item)
     setXmlOutput('')
     setAutocompleteValue('')
@@ -115,17 +117,45 @@ export default function Fields(
     onXmlGenerated()
   }
 
-  const filename = editedItem?.filename ? (Array.isArray(editedItem.filename) ? editedItem.filename[0] : editedItem.filename) : ''
+  const rawFilename = editedItem?.filename ? (Array.isArray(editedItem.filename) ? editedItem.filename[0] : editedItem.filename) : ''
+  const isVideo = editedItem?.type === 'video'
+
+  const swapFilenameExt = (fn: string, toVideo: boolean): string => {
+    const lastDot = fn.lastIndexOf('.')
+    const base = lastDot === -1 ? fn : fn.slice(0, lastDot)
+    return toVideo ? `${base}.mp4` : `${base}.jpg`
+  }
+
+  const displayFilename = rawFilename ? swapFilenameExt(rawFilename, isVideo) : ''
 
   return (
     <>
       <Stack direction="column" spacing={2} sx={{ width: '35rem', flexShrink: 0 }}>
-        <Input
-          value={filename}
-          readOnly
-          placeholder="Filename"
-          title="Filename (read-only)"
-        />
+        <Stack direction="row" spacing={1} alignItems="center" sx={{ minWidth: 0 }}>
+          <Input
+            value={displayFilename}
+            readOnly
+            placeholder="Filename"
+            title="Filename (read-only)"
+            sx={{ flex: 1, minWidth: 0 }}
+          />
+          <Checkbox
+            checked={isVideo}
+            onChange={(e) => updateItem((prev: RawXmlItem | null) => {
+              if (!prev) return null
+              const checked = e.target.checked
+              const currentFn = Array.isArray(prev.filename) ? prev.filename[0] : prev.filename
+              const newFn = swapFilenameExt(currentFn ?? '', checked)
+              const newFilename = Array.isArray(prev.filename) ? [newFn, ...prev.filename.slice(1)] : newFn
+              if (checked) return { ...prev, type: 'video', filename: newFilename }
+              const { type: _t, ...rest } = prev
+              return { ...rest, filename: newFilename } as RawXmlItem
+            })}
+            label="Video item"
+            title="Item type: photo (unchecked) or video (checked). Toggles &lt;type&gt;video&lt;/type&gt; and filename extension (.jpg ↔ .mp4)."
+            slotProps={{ label: { sx: { color: '#E0E0E0' } } }}
+          />
+        </Stack>
         <Input
           value={editedItem?.photo_city ?? ''}
           onChange={(e) => updateItem((prev: RawXmlItem | null) => prev ? { ...prev, photo_city: e.target.value } : null)}
diff --git a/src/components/AdminAlbum/useEditCountPill.tsx b/src/components/AdminAlbum/useEditCountPill.tsx
index 1fa1d96f..300516b9 100644
--- a/src/components/AdminAlbum/useEditCountPill.tsx
+++ b/src/components/AdminAlbum/useEditCountPill.tsx
@@ -45,12 +45,13 @@ export function useEditCountPill(): EditCountPillHook {
   }
 
   // Helper to remove empty/null/undefined properties recursively
-  const removeEmpty = (obj: any): any => {
+  function removeEmpty<T>(obj: T): T | undefined
+  function removeEmpty(obj: unknown): unknown {
     if (obj === null || obj === undefined || obj === '') return undefined
     if (typeof obj !== 'object') return obj
     if (Array.isArray(obj)) return obj.map(removeEmpty).filter((v) => v !== undefined)
 
-    const cleaned: any = {}
+    const cleaned: Record<string, unknown> = {}
     for (const [key, value] of Object.entries(obj)) {
       const cleanedValue = removeEmpty(value)
       if (cleanedValue !== undefined) {
@@ -60,15 +61,39 @@ export function useEditCountPill(): EditCountPillHook {
     return Object.keys(cleaned).length > 0 ? cleaned : undefined
   }
 
-  // Apply all edits from editedItems state and maintain proper field ordering
+  // Apply all edits from editedItems state and maintain XML field order:
+  // $, type, size, filename, then photo_*, then search, geo, ref (type before filename for video)
   const applyEditsToItems = (items: RawXmlItem[]): RawXmlItem[] => {
     return items.map((originalItem: RawXmlItem) => {
       const edited = editedItems[originalItem.$.id]
       if (!edited) return originalItem
 
-      // Reconstruct item with desired field order: search before geo
-      const { search, geo, ref, ...rest } = edited
-      const orderedItem = {
+      const {
+        $,
+        type,
+        size,
+        filename,
+        search,
+        geo,
+        ref,
+        photo_date,
+        photo_city,
+        photo_loc,
+        thumb_caption,
+        photo_desc,
+        ...rest
+      } = edited
+
+      const orderedItem: RawXmlItem = {
+        $,
+        ...(type && { type }),
+        ...(size && { size }),
+        filename,
+        photo_date: photo_date ?? null,
+        photo_city: photo_city ?? '',
+        ...(photo_loc !== undefined && photo_loc !== '' && { photo_loc }),
+        ...(thumb_caption !== undefined && thumb_caption !== '' && { thumb_caption }),
+        ...(photo_desc !== undefined && photo_desc !== '' && { photo_desc }),
         ...rest,
         ...(search !== undefined && search !== null && search !== '' && { search }),
         ...(geo && { geo }),
@@ -76,8 +101,9 @@ export function useEditCountPill(): EditCountPillHook {
       }
 
       // Remove empty properties
-      return removeEmpty(orderedItem)
-    }).filter((item) => item !== undefined)
+      const cleaned = removeEmpty(orderedItem)
+      return cleaned ?? originalItem
+    }).filter((item): item is RawXmlItem => item !== undefined)
   }
 
   const EditCountPill = () => {
diff --git a/src/hooks/useMemory.tsx b/src/hooks/useMemory.tsx
index 31d5847f..dc8dd88b 100644
--- a/src/hooks/useMemory.tsx
+++ b/src/hooks/useMemory.tsx
@@ -50,7 +50,7 @@ const useMemory = (
   }, [filtered, refImageGallery, autoInitialView])
 
   const memoryHtml = details ? (
-    <>
+    <div data-type="memory-details">
       <h3 className={styles.city}>{details.title}</h3>
       {details.persons && (
         <h4 className={styles.person}>
@@ -65,7 +65,7 @@ const useMemory = (
           {decodeURI(details.reference[1]).replaceAll('_', ' ')}
         </Link>
       )}
-    </>
+    </div>
   ) : null
 
   return { setViewed, memoryHtml, viewedList }

From dfb04e14f1ff8b6ebbb08d5d32824d6056d69294 Mon Sep 17 00:00:00 2001
From: Dan BROOKS <dan@domaindesign.ca>
Date: Tue, 3 Feb 2026 18:15:24 -0800
Subject: [PATCH 33/33] chore(package): Bump deps to minor

---
 package-lock.json | 57 +++++++++++++++++++++++++----------------------
 package.json      |  6 ++---
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9b738461..652c43cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "babel-plugin-react-compiler": "^1.0.0",
         "camelcase": "^6.3.0",
         "color-thief-react": "^2.1.0",
-        "glob": "^13.0.0",
+        "glob": "^13.0.1",
         "h3-js": "^4.4.0",
         "heic-convert": "^2.1.0",
         "mapbox-gl": "^3.18.1",
@@ -28,7 +28,7 @@
         "react-map-gl": "^8.1.0",
         "sharp": "^0.34.5",
         "stylis": "^4.3.6",
-        "swr": "^2.3.8",
+        "swr": "^2.4.0",
         "xml2js": "^0.6.2",
         "zod": "^4.3.6"
       },
@@ -43,7 +43,7 @@
         "@types/heic-convert": "^2.1.0",
         "@types/jest": "^30.0.0",
         "@types/mime-types": "^3.0.1",
-        "@types/node": "^24.10.9",
+        "@types/node": "^24.10.10",
         "@types/react": "19.2.10",
         "@types/react-dom": "19.2.3",
         "@types/react-image-gallery": "^1.2.4",
@@ -2237,9 +2237,9 @@
       }
     },
     "node_modules/@isaacs/brace-expansion": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz",
-      "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz",
+      "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==",
       "license": "MIT",
       "dependencies": {
         "@isaacs/balanced-match": "^4.0.1"
@@ -2765,6 +2765,7 @@
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
       "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -4352,9 +4353,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "24.10.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.9.tgz",
-      "integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==",
+      "version": "24.10.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.10.tgz",
+      "integrity": "sha512-+0/4J266CBGPUq/ELg7QUHhN25WYjE0wYTPSQJn1xeu8DOlIOPxXxrNGiLmfAWl7HMMgWFWXpt9IDjMWrF5Iow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6018,9 +6019,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001766",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001766.tgz",
-      "integrity": "sha512-4C0lfJ0/YPjJQHagaE9x2Elb69CIqEPZeG0anQt9SIvIoOH4a4uaRl73IavyO+0qZh6MDLH//DrXThEYKHkmYA==",
+      "version": "1.0.30001767",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001767.tgz",
+      "integrity": "sha512-34+zUAMhSH+r+9eKmYG+k2Rpt8XttfE4yXAjoZvkAPs15xcYQhyBYdalJ65BzivAvGRMViEjy6oKr/S91loekQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -7181,9 +7182,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.283",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.283.tgz",
-      "integrity": "sha512-3vifjt1HgrGW/h76UEeny+adYApveS9dH2h3p57JYzBSXJIKUJAvtmIytDKjcSCt9xHfrNCFJ7gts6vkhuq++w==",
+      "version": "1.5.286",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
+      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
       "dev": true,
       "license": "ISC"
     },
@@ -8970,12 +8971,12 @@
       "license": "MIT"
     },
     "node_modules/glob": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz",
-      "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==",
+      "version": "13.0.1",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.1.tgz",
+      "integrity": "sha512-B7U/vJpE3DkJ5WXTgTpTRN63uV42DseiXXKMwG14LQBXmsdeIoHAPbU/MEo6II0k5ED74uc2ZGTC6MwHFQhF6w==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "minimatch": "^10.1.1",
+        "minimatch": "^10.1.2",
         "minipass": "^7.1.2",
         "path-scurry": "^2.0.0"
       },
@@ -9000,12 +9001,12 @@
       }
     },
     "node_modules/glob/node_modules/minimatch": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz",
-      "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==",
+      "version": "10.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.2.tgz",
+      "integrity": "sha512-fu656aJ0n2kcXwsnwnv9g24tkU5uSmOlTjd6WyyaKm2Z+h1qmY6bAjrcaIxF/BslFqbZ8UBtbJi7KgQOZD2PTw==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "@isaacs/brace-expansion": "^5.0.0"
+        "@isaacs/brace-expansion": "^5.0.1"
       },
       "engines": {
         "node": "20 || >=22"
@@ -10439,6 +10440,7 @@
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
       "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -10992,6 +10994,7 @@
       "version": "10.5.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
       "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -14952,9 +14955,9 @@
       }
     },
     "node_modules/swr": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.8.tgz",
-      "integrity": "sha512-gaCPRVoMq8WGDcWj9p4YWzCMPHzE0WNl6W8ADIx9c3JBEIdMkJGMzW+uzXvxHMltwcYACr9jP+32H8/hgwMR7w==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-2.4.0.tgz",
+      "integrity": "sha512-sUlC20T8EOt1pHmDiqueUWMmRRX03W7w5YxovWX7VR2KHEPCTMly85x05vpkP5i6Bu4h44ePSMD9Tc+G2MItFw==",
       "license": "MIT",
       "dependencies": {
         "dequal": "^2.0.3",
@@ -15017,7 +15020,7 @@
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
       "license": "ISC",
       "dependencies": {
diff --git a/package.json b/package.json
index 6d81b3a5..2cb2b5ee 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "babel-plugin-react-compiler": "^1.0.0",
     "camelcase": "^6.3.0",
     "color-thief-react": "^2.1.0",
-    "glob": "^13.0.0",
+    "glob": "^13.0.1",
     "h3-js": "^4.4.0",
     "heic-convert": "^2.1.0",
     "mapbox-gl": "^3.18.1",
@@ -37,7 +37,7 @@
     "react-map-gl": "^8.1.0",
     "sharp": "^0.34.5",
     "stylis": "^4.3.6",
-    "swr": "^2.3.8",
+    "swr": "^2.4.0",
     "xml2js": "^0.6.2",
     "zod": "^4.3.6"
   },
@@ -52,7 +52,7 @@
     "@types/heic-convert": "^2.1.0",
     "@types/jest": "^30.0.0",
     "@types/mime-types": "^3.0.1",
-    "@types/node": "^24.10.9",
+    "@types/node": "^24.10.10",
     "@types/react": "19.2.10",
     "@types/react-dom": "19.2.3",
     "@types/react-image-gallery": "^1.2.4",