fix(web): context menu overflow (#26760)

This commit is contained in:
Daniil Suvorov
2026-03-09 21:47:54 +03:00
committed by GitHub
parent 0edbca24e4
commit f2726606e0

View File

@@ -2,8 +2,6 @@
import { clickOutside } from '$lib/actions/click-outside';
import { languageManager } from '$lib/managers/language-manager.svelte';
import type { Snippet } from 'svelte';
import { quintOut } from 'svelte/easing';
import { slide } from 'svelte/transition';
interface Props {
isVisible?: boolean;
@@ -14,6 +12,7 @@
ariaLabel?: string | undefined;
ariaLabelledBy?: string | undefined;
ariaActiveDescendant?: string | undefined;
menuScrollView?: HTMLDivElement | undefined;
menuElement?: HTMLUListElement | undefined;
onClose?: (() => void) | undefined;
children?: Snippet;
@@ -28,6 +27,7 @@
ariaLabel = undefined,
ariaLabelledBy = undefined,
ariaActiveDescendant = undefined,
menuScrollView = $bindable(),
menuElement = $bindable(),
onClose = undefined,
children,
@@ -37,33 +37,43 @@
const layoutDirection = $derived(languageManager.rtl ? swap(direction) : direction);
const position = $derived.by(() => {
if (!menuElement) {
if (!menuScrollView || !menuElement) {
return { left: 0, top: 0 };
}
const rect = menuElement.getBoundingClientRect();
const rect = menuScrollView.getBoundingClientRect();
const directionWidth = layoutDirection === 'left' ? rect.width : 0;
const menuHeight = Math.min(menuElement.clientHeight, height) || 0;
const left = Math.max(8, Math.min(window.innerWidth - rect.width, x - directionWidth));
const top = Math.max(8, Math.min(window.innerHeight - menuHeight, y));
const maxHeight = window.innerHeight - top - 8;
const margin = 8;
return { left, top, maxHeight };
const left = Math.max(margin, Math.min(windowInnerWidth - rect.width - margin, x - directionWidth));
const top = Math.max(margin, Math.min(windowInnerHeight - menuElement.clientHeight, y));
const maxHeight = windowInnerHeight - top - margin;
const needScrollBar = menuElement.clientHeight > maxHeight;
return { left, top, maxHeight, needScrollBar };
});
// We need to bind clientHeight since the bounding box may return a height
// of zero when starting the 'slide' animation.
let height: number = $state(0);
let windowInnerHeight: number = $state(0);
let windowInnerWidth: number = $state(0);
</script>
<svelte:window bind:innerWidth={windowInnerWidth} bind:innerHeight={windowInnerHeight} />
<div
bind:clientHeight={height}
class="fixed min-w-50 w-max max-w-75 overflow-hidden rounded-lg shadow-lg z-1 immich-scrollbar"
bind:this={menuScrollView}
class={[
'duration-250 ease-in-out fixed min-w-50 w-max max-w-75 rounded-lg shadow-lg bg-slate-100 z-1 immich-scrollbar',
position.needScrollBar ? 'overflow-auto' : 'overflow-hidden',
]}
style:left="{position.left}px"
style:top="{position.top}px"
transition:slide={{ duration: 250, easing: quintOut }}
style:max-height={isVisible ? `${position.maxHeight}px` : '0px'}
style:transition-property="max-height"
style:scrollbar-color="rgba(85, 86, 87, 0.408) transparent"
use:clickOutside={{ onOutclick: onClose }}
tabindex="-1"
>
<ul
{id}
@@ -71,8 +81,7 @@
aria-label={ariaLabel}
aria-labelledby={ariaLabelledBy}
bind:this={menuElement}
class="flex flex-col transition-all duration-250 ease-in-out outline-none overflow-auto immich-scrollbar"
style:max-height={isVisible ? `${position.maxHeight}px` : '0px'}
class="flex flex-col outline-none"
role="menu"
tabindex="-1"
>