From ffd267424e224eecd96d91adfa745b35f33551f0 Mon Sep 17 00:00:00 2001 From: Evelyn Gordon Date: Tue, 18 Aug 2026 23:43:18 -0500 Subject: [PATCH] feat(mobile): allow swiping notifications away --- .../NotificationBanner.css.ts | 52 ++++++++- .../NotificationBanner.tsx | 103 +++++++++++++++--- 2 files changed, 132 insertions(+), 23 deletions(-) diff --git a/src/app/components/notification-banner/NotificationBanner.css.ts b/src/app/components/notification-banner/NotificationBanner.css.ts index 73320a121..554ce8e44 100644 --- a/src/app/components/notification-banner/NotificationBanner.css.ts +++ b/src/app/components/notification-banner/NotificationBanner.css.ts @@ -13,17 +13,42 @@ const slideIn = keyframes({ }, }); -const slideOut = keyframes({ +const fadeOut = keyframes({ from: { opacity: 1, - transform: 'translateY(0)', }, to: { opacity: 0, + }, +}); + +const slideOut = keyframes({ + from: { + transform: 'translateY(0)', + }, + to: { transform: 'translateY(-100%)', }, }); +const swipeOutLeft = keyframes({ + from: { + transform: 'translateX(0)', + }, + to: { + transform: 'translateX(-100%)', + }, +}); + +const swipeOutRight = keyframes({ + from: { + transform: 'translateX(0)', + }, + to: { + transform: 'translateX(100%)', + }, +}); + // Positions at the top of the viewport, spanning full width. // Uses fixed positioning with safe-area-inset to handle iOS keyboard correctly. // On iOS, the banner stays at the top of the visual viewport even when keyboard is open. @@ -73,17 +98,32 @@ export const Banner = style({ animationName: slideIn, animationDuration: '260ms', animationTimingFunction: 'cubic-bezier(0.22, 0.8, 0.6, 1)', - animationFillMode: 'both', + animationFillMode: 'backwards', + transitionProperty: 'transform', + transitionDuration: '200ms', + transitionTimingFunction: 'ease-out', selectors: { '&:hover': { backgroundColor: color.Surface.ContainerHover, }, - '&[data-dismissing=true]': { - animationName: slideOut, + '&[data-dismissing=up], &[data-dismissing=left], &[data-dismissing=right]': { animationDuration: '200ms', animationTimingFunction: 'cubic-bezier(0.4, 0, 1, 1)', - animationFillMode: 'both', + animationFillMode: 'forwards', + animationComposition: 'accumulate, replace', + }, + '&[data-dismissing=up]': { + animationName: `${slideOut}, ${fadeOut}`, + }, + '&[data-dismissing=left]': { + animationName: `${swipeOutLeft}, ${fadeOut}`, + }, + '&[data-dismissing=right]': { + animationName: `${swipeOutRight}, ${fadeOut}`, + }, + '&[data-swiping=true]': { + transitionProperty: 'none', }, }, }); diff --git a/src/app/components/notification-banner/NotificationBanner.tsx b/src/app/components/notification-banner/NotificationBanner.tsx index cf4cc0633..413b5aacd 100644 --- a/src/app/components/notification-banner/NotificationBanner.tsx +++ b/src/app/components/notification-banner/NotificationBanner.tsx @@ -12,6 +12,7 @@ import * as css from './NotificationBanner.css'; const log = createLogger('NotificationBanner'); const BANNER_DURATION_MS = 5000; +const DISMISS_SWIPE_DISTANCE = 150; // Renders body text capped at a max height with a gradient fade when it overflows. function BodyText({ text, hovered }: { text: string; hovered: boolean }) { @@ -63,31 +64,37 @@ function BannerMessage({ notification }: { notification: InAppBannerNotification ); } +type DismissDirection = 'up' | 'left' | 'right'; + function BannerItem({ notification, onDismiss }: BannerItemProps) { - const [dismissing, setDismissing] = useState(false); + const [dismissing, setDismissing] = useState(); const [paused, setPaused] = useState(false); - const dismissedRef = useRef(false); const dismissAnimTimerRef = useRef | null>(null); const elapsedRef = useRef(0); + const [gesture, setGesture] = useState<{ startX: number; startY: number } | undefined>(); + const [swipeDistance, setSwipeDistance] = useState(0); + // Use a ref to guard against double-dismiss without creating a new callback identity. - const dismiss = useCallback(() => { - if (dismissedRef.current) return; - dismissedRef.current = true; - setDismissing(true); - dismissAnimTimerRef.current = setTimeout(() => onDismiss(notification.id), 200); - }, [notification.id, onDismiss]); + const dismiss = useCallback( + (direction: DismissDirection) => { + if (dismissing) return; + setDismissing(direction); + dismissAnimTimerRef.current = setTimeout(() => onDismiss(notification.id), 200); + }, + [notification.id, onDismiss, dismissing] + ); // Auto-dismiss timer  Eonly runs when not paused. useEffect(() => { if (paused) return undefined; const remaining = BANNER_DURATION_MS - elapsedRef.current; if (remaining <= 0) { - dismiss(); + dismiss('up'); return undefined; } const startedAt = Date.now(); - const t = setTimeout(dismiss, remaining); + const t = setTimeout(() => dismiss('up'), remaining); return () => { clearTimeout(t); // Accumulate time spent un-paused so we can resume from the right point. @@ -104,26 +111,88 @@ function BannerItem({ notification, onDismiss }: BannerItemProps) { const handleClick = () => { notification.onClick(); - dismiss(); + dismiss('up'); }; // When hovering, pause the auto-dismiss timer. - const handleMouseEnter = () => setPaused(true); - const handleMouseLeave = () => setPaused(false); + const handleMouseEnter = useCallback(() => setPaused(true), []); + const handleMouseLeave = useCallback(() => setPaused(false), []); + + const release = useCallback( + (commit: boolean) => { + setPaused(false); + + if (commit && Math.abs(swipeDistance) > DISMISS_SWIPE_DISTANCE) { + // Continue off the side of the screen + dismiss(swipeDistance > 0 ? 'right' : 'left'); + } else { + // Spring back to center + setSwipeDistance(0); + setGesture(undefined); + } + }, + [swipeDistance] + ); + + const handleTouchStart = useCallback( + (event: TouchEvent) => { + const touch = event.touches[0]; + if (!touch || event.touches.length !== 1) { + release(false); + return; + } + + setPaused(true); + + setGesture({ + startX: touch.clientX, + startY: touch.clientY, + }); + }, + [release] + ); + const handleTouchMove = useCallback( + (event: TouchEvent) => { + if (dismissing) return; + const touch = event.touches[0]; + if (!gesture || !touch) return; + + const swipeDistance = touch.clientX - gesture.startX; + setSwipeDistance(swipeDistance); + }, + [dismissing, gesture] + ); + const handleTouchEnd = useCallback(() => { + if (dismissing) return; + release(true); + }, [dismissing, release]); + const handleTouchCancel = useCallback(() => { + if (dismissing) return; + release(false); + }, [dismissing, release]); return (
:( tabIndex={0} onKeyDown={(e) => { if (e.key === 'Enter' || e.key === ' ') handleClick(); - if (e.key === 'Escape') dismiss(); + if (e.key === 'Escape') dismiss('up'); }} onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave} + onTouchStart={handleTouchStart} + onTouchMove={handleTouchMove} + onTouchCancel={handleTouchCancel} + onTouchEnd={handleTouchEnd} + style={{ + transform: `translateX(${swipeDistance}px)`, + willChange: 'transform', + }} > {!notification.event && notification.icon && ( { e.stopPropagation(); - dismiss(); + dismiss('up'); }} aria-label="Dismiss notification" > @@ -173,7 +242,7 @@ function BannerItem({ notification, onDismiss }: BannerItemProps) {
);