popover?: import('svelte').Snippet<[boolean]>
children?: import('svelte').Snippet<[boolean]>
}
@@ -36,17 +37,12 @@
placement = 'bottom-start',
middleware = [offset(6), shift(), flip()],
strategy = 'fixed',
- manual = false,
popoverClass = '',
- class: clazz = '',
target,
popover,
children,
}: Props = $props()
- let canUseContents = $state(true)
-
- let el = $state
()
let popoverEl = $state()
let origins: Record = {
@@ -75,66 +71,58 @@
},
})
- const customFloatingContent = (node: HTMLDivElement) => {
- floatingContent(node)
- }
+ const menuAttach: Attachment = element => {
+ console.log(element)
+ const e = element as HTMLButtonElement
- const customFloatingRef = (node: HTMLDivElement) => {
- const n = node.children.item(0)
+ const mouseLeave = () => (openOnHover ? (open = false) : false)
+ const focus = () => (openOnHover ? (open = true) : false)
+ const focusout = () => (openOnHover ? (open = false) : false)
+ const click = () => {
+ open = !open
- // @ts-expect-error svelte hell
- if (n) floatingRef(n)
- else {
- canUseContents = false
- floatingRef(node)
+ if (autoClose) {
+ const clickHandler = (event: Event) => {
+ if (!e) return
+
+ if (!e?.contains(event.target as Node | null)) {
+ if (!autoClose) {
+ // @ts-expect-error svelte hell
+ if (popoverEl && !popoverEl.contains(event.target)) {
+ open = false
+ }
+ } else {
+ open = false
+ }
+ document.removeEventListener('click', clickHandler)
+ }
+ }
+ document.addEventListener('click', clickHandler)
+ }
+ }
+ const keydown = (event: KeyboardEvent) => {
+ if (event.key === 'Escape') open = false
+ }
+
+ e.addEventListener('mouseleave', mouseLeave)
+ e.addEventListener('focus', focus)
+ e.addEventListener('focusout', focusout)
+ e.addEventListener('click', click)
+ e.addEventListener('keydown', keydown)
+
+ floatingRef(e)
+
+ return () => {
+ e.removeEventListener('mouseleave', mouseLeave)
+ e.removeEventListener('focus', focus)
+ e.removeEventListener('focusout', focusout)
+ e.removeEventListener('click', click)
+ e.removeEventListener('keydown', keydown)
}
}
- {
- if (openOnHover) return
-
- // @ts-expect-error svelte hell
- if (!el?.contains(e.target) && open) {
- if (!autoClose) {
- // @ts-expect-error svelte hell
- if (popoverEl && !popoverEl.contains(e.target)) {
- open = false
- }
- } else {
- open = false
- }
- }
- }}
- onkeydown={async e => {
- if (open && e.key == 'Escape') {
- open = false
- // @ts-expect-error svelte hell
- el?.firstChild.focus()
- }
- }}
-/>
-
-{#if target}
- (openOnHover ? (open = true) : false)}
- onmouseleave={() => (openOnHover ? (open = false) : false)}
- onfocus={() => (openOnHover ? (open = true) : false)}
- onfocusout={() => (openOnHover ? (open = false) : false)}
- onclick={() => (!openOnHover && !manual ? (open = !open) : false)}
- onkeydown={e => {
- if (e.key == 'Escape') open = false
- }}
- tabindex="0"
- role="button"
- class="{canUseContents ? 'contents text-left' : 'w-max h-max'} {clazz}"
- bind:this={el}
- use:customFloatingRef
- >
- {@render target?.()}
-
-{/if}
+{@render target?.(menuAttach)}
{#if open}
@@ -146,7 +134,7 @@
easing: expoOut,
}}
class="z-150 {popoverClass}"
- use:customFloatingContent
+ use:floatingContent
use:focusTrap
bind:this={popoverEl}
>
diff --git a/src/lib/mono/search/Search.svelte b/src/lib/mono/search/Search.svelte
index de00289e..b731f6f0 100644
--- a/src/lib/mono/search/Search.svelte
+++ b/src/lib/mono/search/Search.svelte
@@ -65,9 +65,10 @@