refac
This commit is contained in:
1 parent
4da2ff2655
commit
6e5efc1f75
2 files changed
+120
-14
No files matched your search
@@ -111,6 +111,7 @@
|
|||||||
|
|
||||||
<Dropdown
|
<Dropdown
|
||||||
bind:show
|
bind:show
|
||||||
|
visualViewportAware
|
||||||
on:change={(e) => {
|
on:change={(e) => {
|
||||||
if (e.detail === false) {
|
if (e.detail === false) {
|
||||||
onClose();
|
onClose();
|
||||||
|
|||||||
@@ -26,11 +26,17 @@
|
|||||||
/** Side offset in px */
|
/** Side offset in px */
|
||||||
export let sideOffset = 4;
|
export let sideOffset = 4;
|
||||||
|
|
||||||
let triggerEl;
|
/** Position against the visual viewport, e.g. when the mobile keyboard is open */
|
||||||
let contentEl;
|
export let visualViewportAware = false;
|
||||||
|
|
||||||
|
let triggerEl: HTMLElement | null = null;
|
||||||
|
let contentEl: HTMLElement | null = null;
|
||||||
|
let positionFrame: number | undefined;
|
||||||
|
let settleTimers: number[] = [];
|
||||||
|
let resolvedMaxHeight = maxHeight;
|
||||||
|
|
||||||
/** Svelte action: moves the node to document.body */
|
/** Svelte action: moves the node to document.body */
|
||||||
function portal(node) {
|
function portal(node: HTMLElement) {
|
||||||
document.body.appendChild(node);
|
document.body.appendChild(node);
|
||||||
return {
|
return {
|
||||||
destroy() {
|
destroy() {
|
||||||
@@ -42,13 +48,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Svelte action: captures the first child element as the trigger reference */
|
/** Svelte action: captures the first child element as the trigger reference */
|
||||||
function trigger(node) {
|
function trigger(node: HTMLElement) {
|
||||||
triggerEl = node.firstElementChild || node;
|
triggerEl = (node.firstElementChild as HTMLElement | null) || node;
|
||||||
function handleClick(e) {
|
function handleClick(e: MouseEvent) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
toggleOpen();
|
toggleOpen();
|
||||||
}
|
}
|
||||||
function handleKeydown(e) {
|
function handleKeydown(e: KeyboardEvent) {
|
||||||
if (e.key === 'Enter' || e.key === ' ') {
|
if (e.key === 'Enter' || e.key === ' ') {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
toggleOpen();
|
toggleOpen();
|
||||||
@@ -64,9 +70,20 @@
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function positionContent() {
|
function visualViewportRect() {
|
||||||
|
const viewport = window.visualViewport;
|
||||||
|
return {
|
||||||
|
left: viewport?.offsetLeft ?? 0,
|
||||||
|
top: viewport?.offsetTop ?? 0,
|
||||||
|
width: viewport?.width ?? window.innerWidth,
|
||||||
|
height: viewport?.height ?? window.innerHeight
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function positionContentDefault() {
|
||||||
if (!triggerEl || !contentEl) return;
|
if (!triggerEl || !contentEl) return;
|
||||||
const rect = triggerEl.getBoundingClientRect();
|
const rect = triggerEl.getBoundingClientRect();
|
||||||
|
resolvedMaxHeight = maxHeight;
|
||||||
|
|
||||||
contentEl.style.position = 'fixed';
|
contentEl.style.position = 'fixed';
|
||||||
contentEl.style.zIndex = '9999';
|
contentEl.style.zIndex = '9999';
|
||||||
@@ -112,6 +129,74 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function positionContentVisualViewport() {
|
||||||
|
if (!triggerEl || !contentEl) return;
|
||||||
|
const rect = triggerEl.getBoundingClientRect();
|
||||||
|
const viewport = visualViewportRect();
|
||||||
|
const viewportRight = viewport.left + viewport.width;
|
||||||
|
const viewportBottom = viewport.top + viewport.height;
|
||||||
|
const pad = 8;
|
||||||
|
|
||||||
|
contentEl.style.position = 'fixed';
|
||||||
|
contentEl.style.zIndex = '9999';
|
||||||
|
contentEl.style.maxHeight = maxHeight;
|
||||||
|
|
||||||
|
const contentHeight = contentEl.offsetHeight || 0;
|
||||||
|
const spaceBelow = viewportBottom - rect.bottom - sideOffset - pad;
|
||||||
|
const spaceAbove = rect.top - viewport.top - sideOffset - pad;
|
||||||
|
|
||||||
|
// Auto-flip: prefer the requested side, but flip if not enough space
|
||||||
|
let openAbove = side === 'top';
|
||||||
|
if (side === 'bottom' && spaceBelow < contentHeight && spaceAbove > spaceBelow) {
|
||||||
|
openAbove = true;
|
||||||
|
} else if (side === 'top' && spaceAbove < contentHeight && spaceBelow > spaceAbove) {
|
||||||
|
openAbove = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const availableHeight = Math.max(0, openAbove ? spaceAbove : spaceBelow);
|
||||||
|
const constrainedHeight = contentHeight ? Math.min(contentHeight, availableHeight) : contentHeight;
|
||||||
|
const preferredTop = openAbove ? rect.top - constrainedHeight - sideOffset : rect.bottom + sideOffset;
|
||||||
|
const contentWidth = contentEl.offsetWidth || 0;
|
||||||
|
const preferredLeft = align === 'end' && contentWidth ? rect.right - contentWidth : rect.left;
|
||||||
|
const maxLeft = contentWidth ? viewportRight - contentWidth - pad : preferredLeft;
|
||||||
|
|
||||||
|
contentEl.style.top = `${Math.max(
|
||||||
|
viewport.top + pad,
|
||||||
|
Math.min(preferredTop, viewportBottom - pad - constrainedHeight)
|
||||||
|
)}px`;
|
||||||
|
contentEl.style.bottom = 'auto';
|
||||||
|
contentEl.style.left = `${Math.max(viewport.left + pad, Math.min(preferredLeft, maxLeft))}px`;
|
||||||
|
contentEl.style.right = 'auto';
|
||||||
|
resolvedMaxHeight =
|
||||||
|
contentHeight > availableHeight ? `min(${maxHeight}, ${availableHeight}px)` : maxHeight;
|
||||||
|
contentEl.style.maxHeight = resolvedMaxHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
function positionContent() {
|
||||||
|
if (visualViewportAware) {
|
||||||
|
positionContentVisualViewport();
|
||||||
|
} else {
|
||||||
|
positionContentDefault();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function schedulePositionUpdate() {
|
||||||
|
if (positionFrame != null) cancelAnimationFrame(positionFrame);
|
||||||
|
positionFrame = requestAnimationFrame(() => {
|
||||||
|
positionFrame = undefined;
|
||||||
|
positionContent();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function scheduleSettledPositionUpdates() {
|
||||||
|
for (const timer of settleTimers) window.clearTimeout(timer);
|
||||||
|
settleTimers = [];
|
||||||
|
schedulePositionUpdate();
|
||||||
|
for (const delay of [50, 150, 300]) {
|
||||||
|
settleTimers.push(window.setTimeout(schedulePositionUpdate, delay));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function toggleOpen() {
|
async function toggleOpen() {
|
||||||
show = !show;
|
show = !show;
|
||||||
onOpenChange(show);
|
onOpenChange(show);
|
||||||
@@ -119,7 +204,11 @@
|
|||||||
await tick();
|
await tick();
|
||||||
positionContent();
|
positionContent();
|
||||||
// Re-check after transition renders real dimensions
|
// Re-check after transition renders real dimensions
|
||||||
setTimeout(positionContent, 50);
|
if (visualViewportAware) {
|
||||||
|
scheduleSettledPositionUpdates();
|
||||||
|
} else {
|
||||||
|
setTimeout(positionContent, 50);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,19 +216,24 @@
|
|||||||
$: if (show) {
|
$: if (show) {
|
||||||
tick().then(() => {
|
tick().then(() => {
|
||||||
positionContent();
|
positionContent();
|
||||||
setTimeout(positionContent, 50);
|
if (visualViewportAware) {
|
||||||
|
scheduleSettledPositionUpdates();
|
||||||
|
} else {
|
||||||
|
setTimeout(positionContent, 50);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleWindowPointerDown(event) {
|
function handleWindowPointerDown(event: PointerEvent) {
|
||||||
if (!show || !closeOnOutsideClick) return;
|
if (!show || !closeOnOutsideClick) return;
|
||||||
|
if (!(event.target instanceof Node)) return;
|
||||||
if (triggerEl?.contains(event.target)) return;
|
if (triggerEl?.contains(event.target)) return;
|
||||||
if (contentEl?.contains(event.target)) return;
|
if (contentEl?.contains(event.target)) return;
|
||||||
show = false;
|
show = false;
|
||||||
onOpenChange(false);
|
onOpenChange(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleKeydown(event) {
|
function handleKeydown(event: KeyboardEvent) {
|
||||||
if (event.key === 'Escape' && show) {
|
if (event.key === 'Escape' && show) {
|
||||||
show = false;
|
show = false;
|
||||||
onOpenChange(false);
|
onOpenChange(false);
|
||||||
@@ -154,15 +248,25 @@
|
|||||||
|
|
||||||
import { onMount, onDestroy } from 'svelte';
|
import { onMount, onDestroy } from 'svelte';
|
||||||
|
|
||||||
let onPointerDown;
|
let onPointerDown: ((e: PointerEvent) => void) | undefined;
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
onPointerDown = (e) => handleWindowPointerDown(e);
|
onPointerDown = (e) => handleWindowPointerDown(e);
|
||||||
document.addEventListener('pointerdown', onPointerDown, true);
|
document.addEventListener('pointerdown', onPointerDown, true);
|
||||||
|
if (visualViewportAware) {
|
||||||
|
window.visualViewport?.addEventListener('resize', scheduleSettledPositionUpdates);
|
||||||
|
window.visualViewport?.addEventListener('scroll', schedulePositionUpdate);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
onDestroy(() => {
|
onDestroy(() => {
|
||||||
|
if (positionFrame != null) cancelAnimationFrame(positionFrame);
|
||||||
|
for (const timer of settleTimers) window.clearTimeout(timer);
|
||||||
if (onPointerDown) {
|
if (onPointerDown) {
|
||||||
document.removeEventListener('pointerdown', onPointerDown, true);
|
document.removeEventListener('pointerdown', onPointerDown, true);
|
||||||
}
|
}
|
||||||
|
if (visualViewportAware) {
|
||||||
|
window.visualViewport?.removeEventListener('resize', scheduleSettledPositionUpdates);
|
||||||
|
window.visualViewport?.removeEventListener('scroll', schedulePositionUpdate);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -190,7 +294,8 @@
|
|||||||
bind:this={contentEl}
|
bind:this={contentEl}
|
||||||
class={contentClass}
|
class={contentClass}
|
||||||
role="menu"
|
role="menu"
|
||||||
style:max-height={maxHeight}
|
tabindex="-1"
|
||||||
|
style:max-height={resolvedMaxHeight}
|
||||||
style:overflow-y="auto"
|
style:overflow-y="auto"
|
||||||
transition:flyAndScale
|
transition:flyAndScale
|
||||||
on:click={(e) => e.stopPropagation()}
|
on:click={(e) => e.stopPropagation()}
|
||||||
|
|||||||
Reference in new issue
Block a user