From e4c8d5e668708917da1d01134bda67019acbc6cc Mon Sep 17 00:00:00 2001
From: Luis Rodrigues <lrodrigues@newstore.com>
Date: Sun, 6 Oct 2024 10:58:36 +0200
Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20find=20footnote=20re?=
 =?UTF-8?q?ference=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dom/document.ts | 22 ++++++++++------------
 src/dom/footnote.ts | 13 ++++---------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/dom/document.ts b/src/dom/document.ts
index 9bb31096f..3655df954 100644
--- a/src/dom/document.ts
+++ b/src/dom/document.ts
@@ -75,18 +75,16 @@ function findReference<E extends Element>(
   const processed: E[] = []
   return (link: HTMLAnchorElement): [string, Element, E] | undefined => {
     const fragment = link.href.split('#')[1]
-    const related = fragment
-      ? queryAll<E>(document, '#' + window.CSS.escape(fragment)).find(
-          (footnote) => allowDuplicates || !processed.includes(footnote),
-        )
-      : undefined
-    const body = related?.closest<E>(footnoteSelector)
-
-    if (body) {
-      processed.push(body)
-      const reference = link.closest<E>(anchorParentSelector) || link
-      return [reference.id || link.id, reference, body]
-    }
+    if (!fragment) return
+
+    const body = queryAll<E>(document, '#' + window.CSS.escape(fragment))
+      .find((footnote) => allowDuplicates || !processed.includes(footnote))
+      ?.closest<E>(footnoteSelector)
+    if (!body) return
+
+    processed.push(body)
+    const reference = link.closest<E>(anchorParentSelector) || link
+    return [reference.id || link.id, reference, body]
   }
 }
 
diff --git a/src/dom/footnote.ts b/src/dom/footnote.ts
index cff8bfd9e..00a9c3e7e 100644
--- a/src/dom/footnote.ts
+++ b/src/dom/footnote.ts
@@ -21,8 +21,6 @@ export type FootnoteElements = Readonly<{
   wrapper: HTMLElement
 }>
 
-const isMounted = (popover: HTMLElement) => document.body.contains(popover)
-
 export function footnoteActions({
   id,
   button,
@@ -34,6 +32,8 @@ export function footnoteActions({
   let maxHeight = 0
   let position: Position = 'above'
 
+  const isMounted = () => document.body.contains(popover)
+
   return {
     id,
 
@@ -41,12 +41,9 @@ export function footnoteActions({
       button.setAttribute('aria-expanded', 'true')
       addClass(button, CLASS_CHANGING)
       addClass(button, CLASS_ACTIVE)
-
       button.insertAdjacentElement('afterend', popover)
-
       popover.style.maxWidth = document.body.clientWidth + 'px'
       maxHeight = getMaxHeight(content)
-
       onActivate?.(popover, button)
     },
 
@@ -55,7 +52,6 @@ export function footnoteActions({
       addClass(button, CLASS_CHANGING)
       removeClass(button, CLASS_ACTIVE)
       removeClass(popover, CLASS_ACTIVE)
-
       onDismiss?.(popover, button)
     },
 
@@ -74,9 +70,8 @@ export function footnoteActions({
     },
 
     reposition: () => {
-      if (isMounted(popover)) {
+      if (isMounted()) {
         const [next, height] = repositionPopover(popover, button, position)
-
         position = next
         content.style.maxHeight = Math.min(maxHeight, height) + 'px'
 
@@ -91,7 +86,7 @@ export function footnoteActions({
     },
 
     resize: () => {
-      if (isMounted(popover)) {
+      if (isMounted()) {
         popover.style.left = getLeftInPixels(content, button) + 'px'
         wrapper.style.maxWidth = content.offsetWidth + 'px'
         repositionTooltip(popover, button)