fix(ui): Menues und Dialoge ueber Portal ausgeben
Das Statusmenue auf der Projektseite wurde von den Schaltflaechen "Bearbeiten" und "Loeschen" ueberdeckt, war unten abgeschnitten und der Fortschrittswert schien hindurch. Drei Ursachen, alle mit derselben Wurzel: 1. Die Karten setzen overflow-hidden fuer den Akzentstreifen und den Farbverlaufsrand. Ein absolut positioniertes Kind wird daran abgeschnitten. 2. .glass setzt backdrop-filter, die Projektkarte bekommt beim Hovern zusaetzlich ein transform. Beides erzeugt einen Stacking-Context: das z-index des Menues galt nur noch innerhalb der Karte und verlor gegen spaeter gezeichnete Geschwister. Aus demselben Grund bezog sich das "position: fixed" der Klickflaeche zum Schliessen auf die Karte statt auf das Fenster - ein Klick daneben schloss das Menue nicht. 3. .glass hat 3,5 % Deckkraft. Als Kartenflaeche gut, als Overlay unbrauchbar. Der eigene backdrop-filter half nicht, weil er innerhalb eines Vorfahren mit backdrop-filter wirkungslos bleibt. Behoben durch eine neue Popover-Komponente, die per createPortal am body haengt, ihre Position aus dem Ankerelement berechnet und beim Scrollen und bei Groessenaenderungen nachfuehrt. Reicht der Platz nach unten nicht, klappt sie nach oben. Dazu die Klasse .popover mit nahezu deckendem Hintergrund. Betrifft Statusauswahl, Benutzermenue und - aus demselben Grund - den Modal-Dialog: der wird aus Karten heraus geoeffnet und haette sich sonst an der Karte statt am Fenster ausgerichtet. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -69,6 +69,24 @@
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
/**
|
||||
* Flaeche fuer alles, was ueber dem Inhalt schwebt: Menues, Dialoge.
|
||||
*
|
||||
* Bewusst nahezu deckend statt Glas. Ein Overlay muss lesbar sein, egal
|
||||
* was darunter liegt - bei 3,5 % Deckkraft schien der Inhalt dahinter
|
||||
* durch. backdrop-filter hilft hier nicht: liegt das Element in einem
|
||||
* Vorfahren, der selbst backdrop-filter setzt (unsere Karten), bleibt die
|
||||
* Weichzeichnung wirkungslos.
|
||||
*/
|
||||
.popover {
|
||||
background: rgba(9, 11, 24, 0.97);
|
||||
border: 1px solid rgba(255, 255, 255, 0.11);
|
||||
border-radius: 0.9rem;
|
||||
box-shadow:
|
||||
0 1px 0 0 rgba(255, 255, 255, 0.07) inset,
|
||||
0 28px 70px -24px rgba(0, 0, 0, 0.95);
|
||||
}
|
||||
|
||||
/* ── Text & Akzente ───────────────────────────────────────── */
|
||||
|
||||
.text-gradient {
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useTransition } from "react";
|
||||
import { useRef, useState, useTransition } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { Check, ChevronDown, Loader2 } from "lucide-react";
|
||||
import type { ProjectStatus } from "@prisma/client";
|
||||
import { Popover } from "@/components/ui/Popover";
|
||||
import { STATUS_META, STATUS_ORDER, statusOf } from "@/lib/status";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
@@ -22,6 +23,7 @@ export function StatusSelect({
|
||||
onChanged,
|
||||
}: StatusSelectProps) {
|
||||
const router = useRouter();
|
||||
const triggerRef = useRef<HTMLButtonElement>(null);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [current, setCurrent] = useState<ProjectStatus>(status);
|
||||
const [pending, startTransition] = useTransition();
|
||||
@@ -54,10 +56,12 @@ export function StatusSelect({
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="relative">
|
||||
<>
|
||||
<button
|
||||
ref={triggerRef}
|
||||
type="button"
|
||||
onClick={(event) => {
|
||||
// Die Karte im Board ist ein Link – der darf hier nicht ausloesen.
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
setOpen((value) => !value);
|
||||
@@ -82,21 +86,12 @@ export function StatusSelect({
|
||||
<ChevronDown className="h-3 w-3 opacity-60" />
|
||||
</button>
|
||||
|
||||
{open ? (
|
||||
<>
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Auswahl schliessen"
|
||||
className="fixed inset-0 z-30 cursor-default"
|
||||
onClick={(event) => {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
setOpen(false);
|
||||
}}
|
||||
/>
|
||||
<div
|
||||
<Popover
|
||||
anchorRef={triggerRef}
|
||||
open={open}
|
||||
onClose={() => setOpen(false)}
|
||||
role="listbox"
|
||||
className="glass fade-up absolute right-0 z-40 mt-2 w-60 overflow-hidden p-1.5"
|
||||
width={264}
|
||||
>
|
||||
{STATUS_ORDER.map((value) => {
|
||||
const option = STATUS_META[value];
|
||||
@@ -114,7 +109,7 @@ export function StatusSelect({
|
||||
}}
|
||||
className={cn(
|
||||
"flex w-full items-start gap-2.5 rounded-lg px-2.5 py-2 text-left transition-colors",
|
||||
active ? "bg-white/8" : "hover:bg-white/5",
|
||||
active ? "bg-white/8" : "hover:bg-white/6",
|
||||
)}
|
||||
>
|
||||
<span
|
||||
@@ -133,9 +128,7 @@ export function StatusSelect({
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</Popover>
|
||||
</>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { useRef, useState } from "react";
|
||||
import Link from "next/link";
|
||||
import { usePathname, useRouter } from "next/navigation";
|
||||
import {
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
Sparkles,
|
||||
UserRound,
|
||||
} from "lucide-react";
|
||||
import { Popover } from "@/components/ui/Popover";
|
||||
import type { SessionUser } from "@/lib/auth/session";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
@@ -85,23 +86,7 @@ function UserMenu({ user }: { user: SessionUser }) {
|
||||
const router = useRouter();
|
||||
const [open, setOpen] = useState(false);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const containerRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
function onPointerDown(event: MouseEvent) {
|
||||
if (!containerRef.current?.contains(event.target as Node)) setOpen(false);
|
||||
}
|
||||
function onKey(event: KeyboardEvent) {
|
||||
if (event.key === "Escape") setOpen(false);
|
||||
}
|
||||
document.addEventListener("mousedown", onPointerDown);
|
||||
document.addEventListener("keydown", onKey);
|
||||
return () => {
|
||||
document.removeEventListener("mousedown", onPointerDown);
|
||||
document.removeEventListener("keydown", onKey);
|
||||
};
|
||||
}, [open]);
|
||||
const triggerRef = useRef<HTMLButtonElement>(null);
|
||||
|
||||
async function logout() {
|
||||
setBusy(true);
|
||||
@@ -115,8 +100,9 @@ function UserMenu({ user }: { user: SessionUser }) {
|
||||
const initials = label.slice(0, 2).toUpperCase();
|
||||
|
||||
return (
|
||||
<div className="relative" ref={containerRef}>
|
||||
<>
|
||||
<button
|
||||
ref={triggerRef}
|
||||
type="button"
|
||||
onClick={() => setOpen((value) => !value)}
|
||||
className="flex items-center gap-2 rounded-xl border border-white/10 bg-white/4 py-1.5 pl-1.5 pr-3 text-sm text-slate-200 transition-colors hover:bg-white/8"
|
||||
@@ -132,11 +118,7 @@ function UserMenu({ user }: { user: SessionUser }) {
|
||||
) : null}
|
||||
</button>
|
||||
|
||||
{open ? (
|
||||
<div
|
||||
role="menu"
|
||||
className="glass fade-up absolute right-0 z-50 mt-2 w-60 overflow-hidden p-1.5"
|
||||
>
|
||||
<Popover anchorRef={triggerRef} open={open} onClose={() => setOpen(false)} width={240}>
|
||||
<div className="border-b border-white/6 px-3 py-2">
|
||||
<p className="truncate text-sm text-slate-100">{label}</p>
|
||||
<p className="truncate text-[11px] text-slate-500">
|
||||
@@ -177,8 +159,7 @@ function UserMenu({ user }: { user: SessionUser }) {
|
||||
<LogOut className="h-4 w-4" />
|
||||
Abmelden
|
||||
</button>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
</Popover>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect } from "react";
|
||||
import { useEffect, useState } from "react";
|
||||
import { createPortal } from "react-dom";
|
||||
import { X } from "lucide-react";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
@@ -14,6 +15,14 @@ interface ModalProps {
|
||||
width?: "md" | "lg" | "xl";
|
||||
}
|
||||
|
||||
/**
|
||||
* Dialog per Portal am body.
|
||||
*
|
||||
* Ohne Portal waere "position: fixed" wirkungslos: Dialoge werden aus Karten
|
||||
* heraus geoeffnet, und deren backdrop-filter erzeugt einen neuen
|
||||
* Bezugsrahmen. Der Dialog wuerde sich dann an der Karte ausrichten statt am
|
||||
* Fenster.
|
||||
*/
|
||||
export function Modal({
|
||||
open,
|
||||
title,
|
||||
@@ -23,6 +32,10 @@ export function Modal({
|
||||
footer,
|
||||
width = "lg",
|
||||
}: ModalProps) {
|
||||
const [mounted, setMounted] = useState(false);
|
||||
|
||||
useEffect(() => setMounted(true), []);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
const onKey = (event: KeyboardEvent) => {
|
||||
@@ -37,22 +50,22 @@ export function Modal({
|
||||
};
|
||||
}, [open, onClose]);
|
||||
|
||||
if (!open) return null;
|
||||
if (!mounted || !open) return null;
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-50 flex items-start justify-center overflow-y-auto p-4 sm:p-8">
|
||||
return createPortal(
|
||||
<div className="fixed inset-0 z-[120] flex items-start justify-center overflow-y-auto p-4 sm:p-8">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Dialog schliessen"
|
||||
onClick={onClose}
|
||||
className="fixed inset-0 cursor-default bg-[#03040c]/80 backdrop-blur-sm"
|
||||
className="fixed inset-0 cursor-default bg-[#03040c]/85 backdrop-blur-sm"
|
||||
/>
|
||||
<div
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label={title}
|
||||
className={cn(
|
||||
"glass fade-up relative z-10 my-auto w-full p-6",
|
||||
"popover fade-up relative z-10 my-auto w-full rounded-2xl p-6",
|
||||
width === "md" && "max-w-lg",
|
||||
width === "lg" && "max-w-2xl",
|
||||
width === "xl" && "max-w-4xl",
|
||||
@@ -79,6 +92,7 @@ export function Modal({
|
||||
|
||||
{footer ? <div className="mt-6 flex justify-end gap-2">{footer}</div> : null}
|
||||
</div>
|
||||
</div>
|
||||
</div>,
|
||||
document.body,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,135 @@
|
||||
"use client";
|
||||
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { createPortal } from "react-dom";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
/**
|
||||
* Schwebendes Menue, das per Portal am body haengt.
|
||||
*
|
||||
* Warum nicht einfach ein absolut positioniertes Kind?
|
||||
*
|
||||
* 1. Unsere Karten setzen overflow-hidden (fuer den Akzentstreifen und den
|
||||
* Farbverlaufsrand). Ein Kind wuerde daran abgeschnitten.
|
||||
* 2. .glass setzt backdrop-filter, und die Projektkarte bekommt beim Hovern
|
||||
* ein transform. Beides erzeugt einen Stacking-Context und einen neuen
|
||||
* Bezugsrahmen: z-index wirkt dann nur noch innerhalb der Karte, und
|
||||
* selbst position: fixed bezieht sich auf die Karte statt auf das
|
||||
* Fenster.
|
||||
*
|
||||
* Am body haengend entfaellt beides. Die Position wird aus dem Ankerelement
|
||||
* berechnet und beim Scrollen und bei Groessenaenderungen nachgefuehrt.
|
||||
*/
|
||||
export function Popover({
|
||||
anchorRef,
|
||||
open,
|
||||
onClose,
|
||||
children,
|
||||
align = "end",
|
||||
width = 240,
|
||||
className,
|
||||
labelledBy,
|
||||
role = "menu",
|
||||
}: {
|
||||
anchorRef: React.RefObject<HTMLElement | null>;
|
||||
open: boolean;
|
||||
onClose: () => void;
|
||||
children: React.ReactNode;
|
||||
/** "end" richtet die rechte Kante am Anker aus. */
|
||||
align?: "start" | "end";
|
||||
width?: number;
|
||||
className?: string;
|
||||
labelledBy?: string;
|
||||
role?: "menu" | "listbox" | "dialog";
|
||||
}) {
|
||||
const panelRef = useRef<HTMLDivElement>(null);
|
||||
const [mounted, setMounted] = useState(false);
|
||||
const [position, setPosition] = useState<{ top: number; left: number } | null>(null);
|
||||
|
||||
useEffect(() => setMounted(true), []);
|
||||
|
||||
const place = useCallback(() => {
|
||||
const anchor = anchorRef.current;
|
||||
if (!anchor) return;
|
||||
|
||||
const rect = anchor.getBoundingClientRect();
|
||||
const margin = 8;
|
||||
const gap = 6;
|
||||
|
||||
let left = align === "end" ? rect.right - width : rect.left;
|
||||
left = Math.min(Math.max(margin, left), window.innerWidth - width - margin);
|
||||
|
||||
const panelHeight = panelRef.current?.offsetHeight ?? 0;
|
||||
let top = rect.bottom + gap;
|
||||
|
||||
// Nach oben klappen, wenn unten kein Platz ist, oben aber schon.
|
||||
const fitsBelow = top + panelHeight <= window.innerHeight - margin;
|
||||
const fitsAbove = rect.top - gap - panelHeight >= margin;
|
||||
if (!fitsBelow && fitsAbove) top = rect.top - gap - panelHeight;
|
||||
|
||||
setPosition({ top, left });
|
||||
}, [anchorRef, align, width]);
|
||||
|
||||
// Bewusst useEffect statt useLayoutEffect: Letzteres warnt beim
|
||||
// Server-Rendering. Ein Aufblitzen an falscher Stelle gibt es trotzdem
|
||||
// nicht, weil das Panel bis zur berechneten Position unsichtbar bleibt.
|
||||
useEffect(() => {
|
||||
if (!open) {
|
||||
setPosition(null);
|
||||
return;
|
||||
}
|
||||
place();
|
||||
}, [open, place]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
|
||||
// capture: true, damit auch das Scrollen innerer Container ankommt.
|
||||
const onScroll = () => place();
|
||||
window.addEventListener("scroll", onScroll, true);
|
||||
window.addEventListener("resize", onScroll);
|
||||
|
||||
function onPointerDown(event: MouseEvent) {
|
||||
const target = event.target as Node;
|
||||
if (panelRef.current?.contains(target)) return;
|
||||
if (anchorRef.current?.contains(target)) return;
|
||||
onClose();
|
||||
}
|
||||
function onKey(event: KeyboardEvent) {
|
||||
if (event.key === "Escape") onClose();
|
||||
}
|
||||
|
||||
document.addEventListener("mousedown", onPointerDown);
|
||||
document.addEventListener("keydown", onKey);
|
||||
|
||||
return () => {
|
||||
window.removeEventListener("scroll", onScroll, true);
|
||||
window.removeEventListener("resize", onScroll);
|
||||
document.removeEventListener("mousedown", onPointerDown);
|
||||
document.removeEventListener("keydown", onKey);
|
||||
};
|
||||
}, [open, place, onClose, anchorRef]);
|
||||
|
||||
if (!mounted || !open) return null;
|
||||
|
||||
return createPortal(
|
||||
<div
|
||||
ref={panelRef}
|
||||
role={role}
|
||||
aria-labelledby={labelledBy}
|
||||
style={{
|
||||
position: "fixed",
|
||||
top: position?.top ?? -9999,
|
||||
left: position?.left ?? -9999,
|
||||
width,
|
||||
// Bis die Position steht, unsichtbar halten – sonst blitzt das
|
||||
// Menue kurz an der falschen Stelle auf.
|
||||
visibility: position ? "visible" : "hidden",
|
||||
}}
|
||||
className={cn("popover fade-up z-[100] overflow-hidden p-1.5", className)}
|
||||
>
|
||||
{children}
|
||||
</div>,
|
||||
document.body,
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user