mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 11:36:05 +00:00
6835fd7bf3
Page transitions: on the phone, pages move like a native navigation stack, built on the View Transitions API (mobile/routeTransition.ts). A page opened from another slides in from the trailing edge, back slides it away, and switching between the dock's sections cross-fades while the dock stands still. Lazy routes do not flash their skeleton: the swap waits, behind the frozen snapshot, until the new page rendered. The edge-swipe back gesture already moves the page and skips the transition. RTL mirrors the motion, reduced motion and desktop get none. Pull-to-refresh on the mobile dashboard: the page follows the finger with resistance, ticks once past the threshold and re-reads trips and notifications quietly, without a loading state. Share: trip share and invite links and the journey link get a share button next to copy, opening the system share sheet (Capacitor Share in the apps, Web Share in browsers that have it). Haptics: a selection click for switches and segmented controls, a tick when a sheet is flung closed, and a firmer bump for the chat's long press. Theme lint: this branch's new screens use the type and z-index tokens, the Vacay company tint is a token, and the baseline is lowered to the new counts.
238 lines
9.7 KiB
TypeScript
238 lines
9.7 KiB
TypeScript
import React, { ReactNode, useEffect, useRef, useState } from 'react'
|
|
import { createPortal } from 'react-dom'
|
|
import { lockBodyScroll } from '../../utils/bodyScrollLock'
|
|
import { useTranslation } from '../../i18n'
|
|
import { useDiscardGuard } from '../../components/shared/useDiscardGuard'
|
|
import { keepTabInside, useModalFocus } from './modalFocus'
|
|
import { useSheetDrag } from './useSheetDrag'
|
|
import { useOverlay } from '../overlayStack'
|
|
import { tickHaptic } from '../../native/haptics'
|
|
|
|
export type MSheetVariant = 'card' | 'bottom' | 'drawer'
|
|
export type MSheetMaterial = 'glass' | 'bar-glass' | 'opaque'
|
|
|
|
interface MSheetProps {
|
|
open: boolean
|
|
onClose: () => void
|
|
/** card = centred floating card, bottom = docked panel above the nav, drawer = left drawer */
|
|
variant?: MSheetVariant
|
|
/**
|
|
* glass = translucent sheet (--m-sheet), bar-glass = lighter bar glass
|
|
* (--m-glass, default for the bottom variant), opaque = solid (--m-sheetop)
|
|
*/
|
|
material?: MSheetMaterial
|
|
/** Transparent scrim (the "Mehr" sheet sits on the UI without dimming it) */
|
|
dimTransparent?: boolean
|
|
ariaLabel?: string
|
|
className?: string
|
|
children?: ReactNode
|
|
/**
|
|
* The form's state, for the unsaved-changes question the desktop dialogs ask
|
|
* (#2253): a flick of the handle, a tap on the scrim or Escape asks before
|
|
* throwing away a state that differs from the one at the first touch.
|
|
*/
|
|
discardGuard?: unknown
|
|
}
|
|
|
|
const EXIT_MS = 300
|
|
|
|
const DISCARD_BUTTON = 'rounded-full bg-danger px-4 py-2 text-body font-semibold text-white' // theme-lint-disable: white on the danger fill, as ConfirmDialog draws it
|
|
|
|
const POSITION: Record<MSheetVariant, string> = {
|
|
card: 'absolute inset-x-[14px] top-1/2 -translate-y-1/2',
|
|
bottom: 'absolute inset-x-4 bottom-[calc(var(--bottom-nav-h,84px)+16px)]',
|
|
drawer: 'absolute left-0 top-0 bottom-0 w-[78%] max-w-[320px]',
|
|
}
|
|
|
|
const SHAPE: Record<MSheetVariant, string> = {
|
|
card: 'rounded-[28px] shadow-[0_30px_80px_-24px_rgba(0,0,0,.6)] max-h-[calc(100dvh-var(--m-safe-top,12px)-96px)]',
|
|
bottom: 'rounded-[26px] shadow-[0_-8px_40px_-14px_rgba(0,0,0,.45)] max-h-[calc(100dvh-var(--bottom-nav-h,84px)-var(--m-safe-top,12px)-72px)]',
|
|
drawer: 'h-full shadow-[0_0_60px_-10px_rgba(0,0,0,.5)]',
|
|
}
|
|
|
|
// Deliberate normalisation: the demo borders a few opaque sheets (journey
|
|
// create/entry/settings, drawer) with --rowbr instead of --shbr; both hairlines
|
|
// are near-identical on the solid sheet surface, so every material keeps one
|
|
// border token here.
|
|
const MATERIAL: Record<MSheetMaterial, string> = {
|
|
glass:
|
|
'bg-[color:var(--m-sheet)] backdrop-blur-[40px] backdrop-saturate-[1.8] border border-[color:var(--m-shbr)]',
|
|
'bar-glass':
|
|
'bg-[color:var(--m-glass)] backdrop-blur-[30px] backdrop-saturate-[1.8] border border-[color:var(--m-gbr)]',
|
|
opaque: 'bg-[color:var(--m-sheetop)] border border-[color:var(--m-shbr)]',
|
|
}
|
|
|
|
// The docked sheet rises from below the screen edge like a native sheet; the
|
|
// card pops in place like an alert; the drawer slides from the side.
|
|
const ENTER: Record<MSheetVariant, string> = { card: 'm-sheet-in', bottom: 'm-sheet-up', drawer: 'm-drawer-in' }
|
|
const EXIT: Record<MSheetVariant, string> = { card: 'm-sheet-out', bottom: 'm-sheet-down', drawer: 'm-drawer-out' }
|
|
|
|
function sheetRoot(): HTMLElement {
|
|
return document.getElementById('m-sheet-root') ?? document.body
|
|
}
|
|
|
|
/**
|
|
* The one sheet primitive of the mobile design system. Handles portal,
|
|
* scrim, ESC/backdrop dismissal, body scroll lock, focus trapping, native
|
|
* enter/exit motion and — for the bottom variant — drag-to-dismiss from the top
|
|
* edge or from content scrolled to its top (useSheetDrag).
|
|
*/
|
|
export default function MSheet({
|
|
open,
|
|
onClose,
|
|
variant = 'card',
|
|
material,
|
|
dimTransparent = false,
|
|
ariaLabel,
|
|
className = '',
|
|
children,
|
|
discardGuard,
|
|
}: MSheetProps) {
|
|
const { t } = useTranslation()
|
|
const { asking, markStart, requestClose, wouldAsk, keepEditing, discard, reset } = useDiscardGuard(discardGuard, onClose)
|
|
const [rendered, setRendered] = useState(open)
|
|
// Once the enter animation has played it is removed again: its forwards
|
|
// fill would otherwise override the inline drag transform for good.
|
|
const [entered, setEntered] = useState(false)
|
|
// Thrown off screen by a drag: it leaves from where the finger let go, so the
|
|
// exit animation (which starts from the rest position) must not play.
|
|
const [flung, setFlung] = useState(false)
|
|
const panelRef = useRef<HTMLDivElement>(null)
|
|
const sheetDrag = useSheetDrag({
|
|
enabled: variant === 'bottom' && open && rendered,
|
|
panelRef,
|
|
onDismiss: () => {
|
|
if (wouldAsk()) {
|
|
requestClose()
|
|
return false
|
|
}
|
|
setFlung(true)
|
|
tickHaptic()
|
|
onClose()
|
|
return true
|
|
},
|
|
})
|
|
|
|
// Keep the sheet mounted through the exit animation.
|
|
useEffect(() => {
|
|
if (open) {
|
|
setRendered(true)
|
|
setFlung(false)
|
|
const panel = panelRef.current
|
|
if (panel) {
|
|
panel.style.transform = ''
|
|
panel.style.transition = ''
|
|
}
|
|
return
|
|
}
|
|
setEntered(false)
|
|
// The sheet stays mounted between openings; the next one starts afresh.
|
|
reset()
|
|
const t = setTimeout(() => setRendered(false), EXIT_MS)
|
|
return () => clearTimeout(t)
|
|
}, [open, reset])
|
|
|
|
// Escape belongs to the sheet on top only: a question opened over another
|
|
// sheet closes alone, and the sheet under it stays open with whatever was
|
|
// typed into it. Sheets portal in the order they open, so the top one is the
|
|
// last open panel in the document.
|
|
useEffect(() => {
|
|
if (!open) return
|
|
const onKey = (e: KeyboardEvent) => {
|
|
if (e.key !== 'Escape') return
|
|
const openPanels = document.querySelectorAll('[data-m-sheet="open"]')
|
|
if (openPanels[openPanels.length - 1] !== panelRef.current) return
|
|
if (asking) keepEditing()
|
|
else requestClose()
|
|
}
|
|
document.addEventListener('keydown', onKey)
|
|
return () => document.removeEventListener('keydown', onKey)
|
|
}, [open, asking, keepEditing, requestClose])
|
|
|
|
useEffect(() => {
|
|
if (!open) return
|
|
return lockBodyScroll()
|
|
}, [open])
|
|
|
|
// A way back (the edge swipe, Android's back gesture) closes the sheet on top
|
|
// first, through the same path as the scrim, so unsaved changes still ask.
|
|
useOverlay(open && rendered, requestClose)
|
|
|
|
// Move focus into the dialog on open, hand it back on close.
|
|
useModalFocus(panelRef, open && rendered)
|
|
|
|
if (!rendered) return null
|
|
|
|
// Keep Tab inside the dialog while it is open.
|
|
const handleKeyDown = (e: React.KeyboardEvent) => keepTabInside(e, panelRef.current)
|
|
|
|
const enterClass = ENTER[variant]
|
|
const exitClass = EXIT[variant]
|
|
const animation = open ? (entered ? '' : enterClass) : flung ? '' : exitClass
|
|
|
|
const resolvedMaterial = material ?? (variant === 'bottom' ? 'bar-glass' : 'glass')
|
|
|
|
return createPortal(
|
|
// m-root on the overlay so the --m-* tokens resolve even when the portal
|
|
// has to fall back to document.body (sheet mounted in the same commit as
|
|
// the shell).
|
|
// A transparent scrim skips the overlay's opacity animation: an animating
|
|
// opacity<1 ancestor becomes a backdrop-root that cancels the sheet's own
|
|
// backdrop-blur (the "liquid glass" frost). The sheet still slides via m-sheet-in.
|
|
<div
|
|
className={`m-root fixed inset-0 z-[60] ${dimTransparent ? 'bg-transparent' : `bg-[color:var(--m-dim)] ${open ? 'm-fade-in' : 'm-fade-out'}`}`}
|
|
role="presentation"
|
|
onClick={(e) => {
|
|
if (e.target === e.currentTarget) requestClose()
|
|
}}
|
|
>
|
|
<div className={POSITION[variant]}>
|
|
<div
|
|
ref={panelRef}
|
|
role="dialog"
|
|
aria-modal="true"
|
|
aria-label={ariaLabel}
|
|
data-m-sheet={open ? 'open' : 'closing'}
|
|
tabIndex={-1}
|
|
className={`relative flex flex-col overflow-hidden outline-none text-m-ink ${SHAPE[variant]} ${MATERIAL[resolvedMaterial]} ${animation} ${className}`}
|
|
onClick={(e) => e.stopPropagation()}
|
|
onKeyDown={handleKeyDown}
|
|
onKeyDownCapture={markStart}
|
|
onPointerDownCapture={markStart}
|
|
onAnimationEnd={(e) => {
|
|
if (e.target === e.currentTarget && open) setEntered(true)
|
|
}}
|
|
>
|
|
{variant === 'bottom' && (
|
|
// Invisible grab strip along the top edge — the design shows no
|
|
// handle, the panel starts directly with its content. The content
|
|
// pulls the sheet too, once it is scrolled to its top.
|
|
<div
|
|
className="absolute inset-x-0 top-0 z-[1] h-6 cursor-grab touch-none active:cursor-grabbing"
|
|
{...sheetDrag.strip}
|
|
/>
|
|
)}
|
|
{children}
|
|
{asking && (
|
|
<div className="absolute inset-0 z-10 grid place-items-center bg-[color:var(--m-dim)] p-5 backdrop-blur-[2px]">
|
|
<div role="alertdialog" aria-label={t('common.unsavedTitle')} className="w-full max-w-[320px] rounded-[22px] border border-[color:var(--m-shbr)] bg-[color:var(--m-sheetop)] p-5">
|
|
<div className="text-subtitle font-semibold text-m-ink">{t('common.unsavedTitle')}</div>
|
|
<p className="m-0 mt-1.5 text-body text-m-muted">{t('common.unsavedMessage')}</p>
|
|
<div className="mt-4 flex justify-end gap-2">
|
|
<button type="button" autoFocus onClick={keepEditing} className="rounded-full border border-[color:var(--m-shbr)] px-4 py-2 text-body font-semibold text-m-ink">
|
|
{t('common.keepEditing')}
|
|
</button>
|
|
<button type="button" onClick={discard} className={DISCARD_BUTTON}>
|
|
{t('common.discard')}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</div>,
|
|
sheetRoot(),
|
|
)
|
|
}
|