mirror of
https://github.com/nimbold/Firelink.git
synced 2026-09-04 06:55:23 +00:00
fix(ui): implement robust CSS transitions for toast animations
Migrate from CSS keyframes to a React state-machine using useLayoutEffect and CSS transitions. Fixes animation interruption jumps, double-timeout memory leaks, layout snapping, and correctly handles duration: 0.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import React, { createContext, useContext, useState, useCallback, ReactNode, useEffect, useRef } from 'react';
|
import React, { createContext, useContext, useState, useCallback, ReactNode, useEffect, useRef, useLayoutEffect } from 'react';
|
||||||
import { CheckCircle2, AlertCircle, Info, XCircle, X } from 'lucide-react';
|
import { CheckCircle2, AlertCircle, Info, XCircle, X } from 'lucide-react';
|
||||||
|
|
||||||
export type ToastVariant = 'success' | 'info' | 'warning' | 'error';
|
export type ToastVariant = 'success' | 'info' | 'warning' | 'error';
|
||||||
@@ -32,16 +32,21 @@ export const ToastProvider: React.FC<{ children: ReactNode }> = ({ children }) =
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const removeToast = useCallback((id: string) => {
|
const removeToast = useCallback((id: string) => {
|
||||||
setToasts(prev => prev.map(t => t.id === id ? { ...t, exiting: true } : t));
|
setToasts(prev => {
|
||||||
setTimeout(() => {
|
// Prevent multiple exit calls and re-renders for the same ID
|
||||||
setToasts(prev => prev.filter(t => t.id !== id));
|
if (prev.find(t => t.id === id)?.exiting) return prev;
|
||||||
}, 300); // Matches the exit animation duration
|
return prev.map(t => t.id === id ? { ...t, exiting: true } : t);
|
||||||
|
});
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const removeToastCompletely = useCallback((id: string) => {
|
||||||
|
setToasts(prev => prev.filter(t => t.id !== id));
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ToastContext.Provider value={{ addToast, removeToast }}>
|
<ToastContext.Provider value={{ addToast, removeToast }}>
|
||||||
{children}
|
{children}
|
||||||
<ToastContainer toasts={toasts} removeToast={removeToast} />
|
<ToastContainer toasts={toasts} removeToast={removeToast} removeToastCompletely={removeToastCompletely} />
|
||||||
</ToastContext.Provider>
|
</ToastContext.Provider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -52,17 +57,40 @@ export const useToast = () => {
|
|||||||
return context;
|
return context;
|
||||||
};
|
};
|
||||||
|
|
||||||
const ToastItem: React.FC<{ toast: ToastState; removeToast: (id: string) => void }> = ({ toast, removeToast }) => {
|
const ToastItem: React.FC<{ toast: ToastState; removeToast: (id: string) => void; removeToastCompletely: (id: string) => void }> = ({ toast, removeToast, removeToastCompletely }) => {
|
||||||
|
const [isMounted, setIsMounted] = useState(false);
|
||||||
const [isHovered, setIsHovered] = useState(false);
|
const [isHovered, setIsHovered] = useState(false);
|
||||||
|
const elementRef = useRef<HTMLDivElement>(null);
|
||||||
|
const [contentHeight, setContentHeight] = useState<number | undefined>(undefined);
|
||||||
|
|
||||||
|
useLayoutEffect(() => {
|
||||||
|
if (elementRef.current && !isMounted) {
|
||||||
|
// Measure natural height of the toast
|
||||||
|
setContentHeight(elementRef.current.offsetHeight);
|
||||||
|
|
||||||
|
let frame2: number;
|
||||||
|
const frame1 = requestAnimationFrame(() => {
|
||||||
|
frame2 = requestAnimationFrame(() => setIsMounted(true));
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
cancelAnimationFrame(frame1);
|
||||||
|
if (frame2) cancelAnimationFrame(frame2);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}, [isMounted]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let timeoutDuration = toast.duration ?? 5000;
|
// 1. If exiting, don't trigger the auto-dismiss timer
|
||||||
if (timeoutDuration < 5000) timeoutDuration = 5000;
|
if (toast.exiting) return;
|
||||||
|
|
||||||
if (toast.isActionable || (toast.variant === 'error' && !toast.duration)) {
|
// Explicitly treat a duration of 0 as a permanent toast
|
||||||
|
if (toast.duration === 0 || toast.isActionable || (toast.variant === 'error' && !toast.duration)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let timeoutDuration = toast.duration ?? 5000;
|
||||||
|
if (timeoutDuration < 5000) timeoutDuration = 5000;
|
||||||
|
|
||||||
if (isHovered) {
|
if (isHovered) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -74,6 +102,16 @@ const ToastItem: React.FC<{ toast: ToastState; removeToast: (id: string) => void
|
|||||||
return () => clearTimeout(timer);
|
return () => clearTimeout(timer);
|
||||||
}, [toast, isHovered, removeToast]);
|
}, [toast, isHovered, removeToast]);
|
||||||
|
|
||||||
|
// Fallback safety timer just in case browser drops onTransitionEnd
|
||||||
|
useEffect(() => {
|
||||||
|
if (toast.exiting) {
|
||||||
|
const fallbackTimer = setTimeout(() => {
|
||||||
|
removeToastCompletely(toast.id);
|
||||||
|
}, 500);
|
||||||
|
return () => clearTimeout(fallbackTimer);
|
||||||
|
}
|
||||||
|
}, [toast.exiting, toast.id, removeToastCompletely]);
|
||||||
|
|
||||||
const role = toast.variant === 'error' ? 'alert' : 'status';
|
const role = toast.variant === 'error' ? 'alert' : 'status';
|
||||||
|
|
||||||
const variantStyles = {
|
const variantStyles = {
|
||||||
@@ -94,43 +132,55 @@ const ToastItem: React.FC<{ toast: ToastState; removeToast: (id: string) => void
|
|||||||
const style = variantStyles[variant];
|
const style = variantStyles[variant];
|
||||||
const Icon = icons[variant];
|
const Icon = icons[variant];
|
||||||
|
|
||||||
|
const isVisible = isMounted && !toast.exiting;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
role={role}
|
className={`w-full transition-all duration-300 ease-[cubic-bezier(0.16,1,0.3,1)] flex flex-col justify-end ${isVisible ? 'mb-3' : 'mb-0'}`}
|
||||||
className={`app-toast-item pointer-events-auto flex items-start gap-3 rounded-[16px] border px-4 py-3 shadow-[0_8px_30px_rgb(0,0,0,0.12),0_0_20px_var(--tw-shadow-color)] backdrop-blur-xl transition-all duration-300 text-[14px] leading-relaxed ${style} ${toast.exiting ? 'opacity-0 scale-95 translate-y-4' : 'opacity-100 scale-100 translate-y-0'}`}
|
|
||||||
style={{
|
style={{
|
||||||
transformOrigin: 'bottom center',
|
height: isVisible && contentHeight !== undefined ? contentHeight : 0,
|
||||||
animation: toast.exiting ? 'none' : 'toast-slide-up 400ms cubic-bezier(0.16, 1, 0.3, 1) forwards'
|
}}
|
||||||
|
onTransitionEnd={(e) => {
|
||||||
|
// 2. Rely on height transition end to safely unmount, instead of hardcoded fixed setTimeouts
|
||||||
|
if (toast.exiting && e.target === e.currentTarget && e.propertyName === 'height') {
|
||||||
|
removeToastCompletely(toast.id);
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
onMouseEnter={() => setIsHovered(true)}
|
|
||||||
onMouseLeave={() => setIsHovered(false)}
|
|
||||||
onFocus={() => setIsHovered(true)}
|
|
||||||
onBlur={() => setIsHovered(false)}
|
|
||||||
>
|
>
|
||||||
<div className="mt-0.5">{Icon}</div>
|
<div
|
||||||
<div className="font-semibold flex-1 tracking-tight">{toast.message}</div>
|
ref={elementRef}
|
||||||
<button
|
role={role}
|
||||||
onClick={() => removeToast(toast.id)}
|
className={`app-toast-item shrink-0 ${isVisible ? 'pointer-events-auto' : 'pointer-events-none'} flex items-start gap-3 rounded-[16px] border px-4 py-3 shadow-[0_8px_30px_rgb(0,0,0,0.12),0_0_20px_var(--tw-shadow-color)] backdrop-blur-xl text-[14px] leading-relaxed transition-all duration-300 ease-[cubic-bezier(0.16,1,0.3,1)] ${style}`}
|
||||||
className="shrink-0 ml-2 mt-0.5 opacity-60 hover:opacity-100 hover:bg-black/5 dark:hover:bg-white/10 p-1 rounded-full transition-all active:scale-90"
|
style={{
|
||||||
aria-label="Dismiss notification"
|
opacity: isVisible ? 1 : 0,
|
||||||
|
transform: isVisible ? 'translateY(0) scale(1)' : 'translateY(24px) scale(0.95)',
|
||||||
|
transformOrigin: 'bottom center',
|
||||||
|
}}
|
||||||
|
onMouseEnter={() => setIsHovered(true)}
|
||||||
|
onMouseLeave={() => setIsHovered(false)}
|
||||||
|
onFocus={() => setIsHovered(true)}
|
||||||
|
onBlur={() => setIsHovered(false)}
|
||||||
>
|
>
|
||||||
<X className="w-4 h-4" strokeWidth={2.5} />
|
<div className="mt-0.5 shrink-0">{Icon}</div>
|
||||||
</button>
|
<div className="font-semibold flex-1 tracking-tight">{toast.message}</div>
|
||||||
|
<button
|
||||||
|
onClick={() => removeToast(toast.id)}
|
||||||
|
className="shrink-0 ml-2 mt-0.5 opacity-60 hover:opacity-100 hover:bg-black/5 dark:hover:bg-white/10 p-1 rounded-full transition-all active:scale-90"
|
||||||
|
aria-label="Dismiss notification"
|
||||||
|
>
|
||||||
|
<X className="w-4 h-4" strokeWidth={2.5} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const ToastContainer: React.FC<{ toasts: ToastState[]; removeToast: (id: string) => void }> = ({ toasts, removeToast }) => {
|
const ToastContainer: React.FC<{ toasts: ToastState[]; removeToast: (id: string) => void; removeToastCompletely: (id: string) => void }> = ({ toasts, removeToast, removeToastCompletely }) => {
|
||||||
return (
|
return (
|
||||||
<div className="fixed bottom-8 left-1/2 -translate-x-1/2 z-[100] flex w-full max-w-[420px] flex-col gap-3 pointer-events-none items-center px-4">
|
// 3. Removed 'gap-3' to allow the dynamic mb-3 from the wrapper to handle spacing, allowing it to smoothly collapse
|
||||||
<style>{`
|
<div className="fixed bottom-8 left-1/2 -translate-x-1/2 z-[100] flex w-full max-w-[420px] flex-col pointer-events-none items-center px-4">
|
||||||
@keyframes toast-slide-up {
|
|
||||||
from { opacity: 0; transform: translateY(24px) scale(0.95); }
|
|
||||||
to { opacity: 1; transform: translateY(0) scale(1); }
|
|
||||||
}
|
|
||||||
`}</style>
|
|
||||||
{toasts.map(toast => (
|
{toasts.map(toast => (
|
||||||
<ToastItem key={toast.id} toast={toast} removeToast={removeToast} />
|
<ToastItem key={toast.id} toast={toast} removeToast={removeToast} removeToastCompletely={removeToastCompletely} />
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user