mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-06 06:02:05 +02:00
Two latent issues surfaced after the original AssignSpoolModal z-50 →
z-[100] bump landed:
1. Material-mismatch ConfirmModal hidden behind AssignSpoolModal.
ConfirmModal's overlay was hardcoded to z-50 in its wrapper, so once
the parent moved to z-[100] the nested confirmation dialog sat
behind it. Added an optional overlayZIndex prop to ConfirmModal
(defaults to z-50 — none of the 82 other call sites change), and
the mismatch site in AssignSpoolModal passes z-[110] so the warning
stacks above its parent.
2. FilamentHoverCard / EmptySlotHoverCard covered by sibling printer
cards on the dashboard. The popovers used position:absolute with
z-[60] inside the trigger, but every printer card creates its own
stacking context (drop-shadow filter on the slot tiles is enough),
and z-index doesn't cross stacking-context boundaries — the next
sibling card always wins by DOM order. Visible as the "Jade White
· Bambu PETG HF" tooltip getting half-eaten by the neighbour card's
AMS column.
Fixed by portaling both hover cards to document.body with
position:fixed and screen-space coordinates from
triggerRef.getBoundingClientRect(). Coords recompute on visibility
change, scroll (capture), and resize so the popover follows the
trigger when the viewport moves; a requestAnimationFrame re-measure
after the first paint avoids a one-frame flicker before the card
has its rendered dimensions. Hover handlers are wired on both the
trigger AND the portaled card so moving the cursor from slot to
popover doesn't auto-dismiss after 100 ms. Top/bottom placement
and arrow-pointer logic preserved.
124 lines
3.9 KiB
TypeScript
124 lines
3.9 KiB
TypeScript
import { useEffect, type ReactNode } from 'react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import { AlertTriangle, Loader2 } from 'lucide-react';
|
|
import { Card, CardContent } from './Card';
|
|
import { Button } from './Button';
|
|
|
|
interface ConfirmModalProps {
|
|
title: string;
|
|
message: string;
|
|
confirmText?: string;
|
|
cancelText?: string;
|
|
cancelVariant?: 'primary' | 'secondary' | 'danger' | 'ghost';
|
|
cardClassName?: string;
|
|
// Tailwind z-index utility applied to the fixed overlay. Defaults to
|
|
// ``z-50``. Use a higher value (e.g. ``z-[110]``) when this confirm
|
|
// dialog is rendered from inside another modal that uses ``z-[100]`` —
|
|
// without it the confirm dialog sits behind its parent (#1336 follow-up).
|
|
overlayZIndex?: string;
|
|
variant?: 'danger' | 'warning' | 'default';
|
|
isLoading?: boolean;
|
|
loadingText?: string;
|
|
// Optional extra content rendered between the message and the buttons —
|
|
// used for opt-in checkboxes (e.g. the "Also remove from statistics"
|
|
// toggle in the archive delete confirmation, #1343).
|
|
children?: ReactNode;
|
|
onConfirm: () => void;
|
|
onCancel: () => void;
|
|
}
|
|
|
|
export function ConfirmModal({
|
|
title,
|
|
message,
|
|
confirmText,
|
|
cancelText,
|
|
cancelVariant,
|
|
cardClassName,
|
|
overlayZIndex,
|
|
variant = 'default',
|
|
isLoading = false,
|
|
loadingText,
|
|
children,
|
|
onConfirm,
|
|
onCancel,
|
|
}: ConfirmModalProps) {
|
|
const { t } = useTranslation();
|
|
const resolvedConfirmText = confirmText ?? t('common.confirm');
|
|
const resolvedCancelText = cancelText ?? t('common.cancel');
|
|
const resolvedLoadingText = loadingText ?? t('common.loading');
|
|
// Close on Escape key (but not while loading)
|
|
useEffect(() => {
|
|
const handleKeyDown = (e: KeyboardEvent) => {
|
|
if (e.key === 'Escape' && !isLoading) onCancel();
|
|
};
|
|
window.addEventListener('keydown', handleKeyDown);
|
|
return () => window.removeEventListener('keydown', handleKeyDown);
|
|
}, [onCancel, isLoading]);
|
|
|
|
const variantStyles = {
|
|
danger: {
|
|
icon: 'text-red-400',
|
|
button: 'bg-red-500 hover:bg-red-600',
|
|
},
|
|
warning: {
|
|
icon: 'text-yellow-400',
|
|
button: 'bg-yellow-500 hover:bg-yellow-600 text-black',
|
|
},
|
|
default: {
|
|
icon: 'text-bambu-green',
|
|
button: 'bg-bambu-green hover:bg-bambu-green-dark',
|
|
},
|
|
};
|
|
|
|
const styles = variantStyles[variant];
|
|
|
|
return (
|
|
<div
|
|
className={`fixed inset-0 bg-black/50 flex items-center justify-center p-4 ${overlayZIndex ?? 'z-50'}`}
|
|
onClick={isLoading ? undefined : onCancel}
|
|
>
|
|
<Card
|
|
className={`w-full max-w-md ${cardClassName ?? ''}`}
|
|
onClick={(e: React.MouseEvent) => e.stopPropagation()}
|
|
>
|
|
<CardContent className="p-6">
|
|
<div className="flex items-start gap-4">
|
|
<div className={`p-2 rounded-full bg-bambu-dark ${styles.icon}`}>
|
|
<AlertTriangle className="w-6 h-6" />
|
|
</div>
|
|
<div className="flex-1">
|
|
<h3 className="text-lg font-semibold text-white mb-2">{title}</h3>
|
|
<p className="text-bambu-gray text-sm whitespace-pre-line">{message}</p>
|
|
{children && <div className="mt-4">{children}</div>}
|
|
</div>
|
|
</div>
|
|
<div className="flex gap-3 mt-6">
|
|
<Button
|
|
variant={cancelVariant ?? 'secondary'}
|
|
onClick={onCancel}
|
|
className="flex-1"
|
|
disabled={isLoading}
|
|
>
|
|
{resolvedCancelText}
|
|
</Button>
|
|
<Button
|
|
onClick={onConfirm}
|
|
className={`flex-1 ${styles.button}`}
|
|
disabled={isLoading}
|
|
>
|
|
{isLoading ? (
|
|
<>
|
|
<Loader2 className="w-4 h-4 mr-2 animate-spin" />
|
|
{resolvedLoadingText}
|
|
</>
|
|
) : (
|
|
resolvedConfirmText
|
|
)}
|
|
</Button>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
);
|
|
}
|