mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 11:36:05 +00:00
6d093d1102
- The rename and reorder controls beside the day's name, and the day and weather chips on the timeline card, are now round or pill glass controls of one height, so they read as tappable; the stay chips follow. - A leg between two stops is one pill, as on the desktop: the mode, the time in full weight and the distance beside it, larger and without a dot. - The timeline flows under the up-next card at a fixed 12px, whatever its height, instead of an offset that left a gap when the stop has no address. - The places bar on the map wears the day rail's glass at its 36px height. - A context menu stays inside all four edges of the screen, measured at its real size rather than mid-animation, and scrolls when taller than it.
196 lines
8.2 KiB
TypeScript
196 lines
8.2 KiB
TypeScript
import { RotateCw, AlertTriangle } from 'lucide-react'
|
|
import { useTranslation } from '../../i18n'
|
|
import { Tooltip } from '../shared/Tooltip'
|
|
import type { ExplorePoiCategory, PoiCategoryGroups } from './usePoiCategories'
|
|
|
|
interface Props {
|
|
/** The chips to offer, from usePoiCategories by way of usePoiExplore. */
|
|
categories: PoiCategoryGroups
|
|
active: Set<string>
|
|
onToggle: (key: string) => void
|
|
loadingKeys?: Set<string>
|
|
/** categories whose last fetch failed → show a retry affordance */
|
|
errorKeys?: Set<string>
|
|
/** true when the map moved since the last search → offer "search this area" */
|
|
moved?: boolean
|
|
onSearchArea?: () => void
|
|
/** Stretch the bar across its container and spread the segments evenly.
|
|
* The phone map gives it the full width between the screen margins; on
|
|
* desktop it floats, so it stays content-width there. */
|
|
fullWidth?: boolean
|
|
/** The phone shell's chrome: the glass, hairline and 36px height of the day rail
|
|
* and the tab switch above it, so the three bars read as one set. */
|
|
phoneChrome?: boolean
|
|
}
|
|
|
|
// The touch target every segment keeps, however many categories there are.
|
|
const SEGMENT = 34
|
|
// On the phone the segment is as tall as a day chip; it keeps its width.
|
|
const PHONE_SEGMENT_HEIGHT = 28
|
|
|
|
/** The phone shell's glass, as the day rail draws it (bg/border --m-glass/--m-gbr). */
|
|
const PHONE_GLASS: React.CSSProperties = {
|
|
background: 'var(--m-glass)',
|
|
border: '1px solid var(--m-gbr)',
|
|
backdropFilter: 'blur(24px) saturate(170%)',
|
|
WebkitBackdropFilter: 'blur(24px) saturate(170%)',
|
|
}
|
|
|
|
// How far one wheel step moves the bar. Firefox counts a mouse wheel in lines and
|
|
// some drivers in pages; a line moves about one segment, a page one bar width.
|
|
function wheelPixels(e: React.WheelEvent, barWidth: number): number {
|
|
if (e.deltaMode === WheelEvent.DOM_DELTA_LINE) return e.deltaY * SEGMENT
|
|
if (e.deltaMode === WheelEvent.DOM_DELTA_PAGE) return e.deltaY * barWidth
|
|
return e.deltaY
|
|
}
|
|
|
|
// The bar only ever overflows sideways and a plain mouse wheel only turns vertically,
|
|
// so on desktop the chips past the corridor edge (the plugin ones first) were out of
|
|
// reach without a trackpad. While the bar overflows, a mostly vertical turn scrolls it
|
|
// sideways. A sideways swipe or Shift+wheel already scrolls it natively and is left alone.
|
|
// In a right-to-left language the chips overflow to the left and scrollLeft runs from 0
|
|
// down into negative numbers, so the same turn has to count the other way to reach them.
|
|
function wheelSideways(e: React.WheelEvent<HTMLDivElement>) {
|
|
const bar = e.currentTarget
|
|
if (bar.scrollWidth <= bar.clientWidth || Math.abs(e.deltaY) <= Math.abs(e.deltaX)) return
|
|
const towardEnd = getComputedStyle(bar).direction === 'rtl' ? -1 : 1
|
|
bar.scrollLeft += towardEnd * wheelPixels(e, bar.clientWidth)
|
|
}
|
|
|
|
interface SegmentProps {
|
|
cat: ExplorePoiCategory
|
|
on: boolean
|
|
loading: boolean
|
|
failed: boolean
|
|
fullWidth?: boolean
|
|
phoneChrome?: boolean
|
|
onToggle: (key: string) => void
|
|
}
|
|
|
|
function Segment({ cat, on, loading, failed, fullWidth, phoneChrome, onToggle }: Readonly<SegmentProps>) {
|
|
return (
|
|
<Tooltip label={cat.label} placement="bottom">
|
|
<button
|
|
type="button"
|
|
onClick={() => onToggle(cat.key)}
|
|
aria-pressed={on}
|
|
aria-label={cat.label}
|
|
className={on ? '' : 'text-content-muted'}
|
|
style={{
|
|
position: 'relative',
|
|
display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
|
|
flexGrow: fullWidth ? 1 : undefined,
|
|
// Spread on the phone, fixed on desktop, and never narrower than the touch
|
|
// target either way: past that the bar scrolls instead of squeezing.
|
|
flexShrink: fullWidth ? 1 : 0,
|
|
flexBasis: fullWidth ? 0 : undefined,
|
|
minWidth: SEGMENT,
|
|
width: fullWidth ? 'auto' : SEGMENT, height: phoneChrome ? PHONE_SEGMENT_HEIGHT : SEGMENT, borderRadius: 999, border: 'none', cursor: 'pointer',
|
|
background: on ? cat.color : 'transparent',
|
|
color: on ? '#fff' : undefined,
|
|
transition: 'background 0.14s, color 0.14s',
|
|
}}
|
|
onMouseEnter={e => { if (!on) e.currentTarget.style.background = 'var(--bg-hover)' }}
|
|
onMouseLeave={e => { if (!on) e.currentTarget.style.background = 'transparent' }}
|
|
>
|
|
{loading ? (
|
|
<span
|
|
className="animate-spin"
|
|
style={{
|
|
width: 14, height: 14, borderRadius: 999, display: 'inline-block',
|
|
border: '2px solid', borderColor: on ? 'rgba(255,255,255,0.45)' : 'var(--border-primary)',
|
|
borderTopColor: on ? '#fff' : 'var(--text-muted)',
|
|
}}
|
|
/>
|
|
) : (
|
|
<cat.Icon size={16} strokeWidth={2} />
|
|
)}
|
|
{on && !loading && failed && (
|
|
<span style={{
|
|
position: 'absolute', top: 2, right: 2, width: 8, height: 8,
|
|
borderRadius: 999, background: 'var(--danger)', border: '1.5px solid var(--sidebar-bg)',
|
|
}} />
|
|
)}
|
|
</button>
|
|
</Tooltip>
|
|
)
|
|
}
|
|
|
|
// Frosted, icon-only segmented control that floats over the map. Active segments
|
|
// fill with the category colour (matching their markers); the label shows in a
|
|
// custom tooltip on hover so the pill stays compact. The core categories come first
|
|
// and whatever plugins add follows a thin divider (#1781); once that is more than the
|
|
// width holds, the bar scrolls sideways (by swipe, trackpad or mouse wheel) rather than
|
|
// shrinking a segment below the touch target.
|
|
export default function PoiCategoryPill({ categories, active, onToggle, loadingKeys, errorKeys, moved, onSearchArea, fullWidth, phoneChrome }: Readonly<Props>) {
|
|
const { t } = useTranslation()
|
|
const anyError = !!errorKeys && Array.from(active).some(k => errorKeys.has(k))
|
|
|
|
const frosted: React.CSSProperties = phoneChrome ? PHONE_GLASS : {
|
|
background: 'var(--sidebar-bg)',
|
|
backdropFilter: 'blur(20px) saturate(180%)',
|
|
WebkitBackdropFilter: 'blur(20px) saturate(180%)',
|
|
boxShadow: 'var(--sidebar-shadow, 0 4px 16px rgba(0,0,0,0.14))',
|
|
}
|
|
|
|
const segment = (cat: ExplorePoiCategory) => {
|
|
const on = active.has(cat.key)
|
|
// Only an active category can be loading: a deselected one whose fetch
|
|
// is still winding down must not keep spinning.
|
|
const loading = on && !!loadingKeys?.has(cat.key)
|
|
return (
|
|
<Segment
|
|
key={cat.key}
|
|
cat={cat}
|
|
on={on}
|
|
loading={loading}
|
|
failed={!!errorKeys?.has(cat.key)}
|
|
fullWidth={fullWidth}
|
|
phoneChrome={phoneChrome}
|
|
onToggle={onToggle}
|
|
/>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 8, width: fullWidth ? '100%' : undefined, maxWidth: '100%', minWidth: 0 }}>
|
|
<div onWheel={wheelSideways} style={{
|
|
display: fullWidth ? 'flex' : 'inline-flex',
|
|
alignSelf: fullWidth ? 'stretch' : undefined,
|
|
alignItems: 'center', gap: 2, padding: phoneChrome ? 3 : 4, borderRadius: 999, pointerEvents: 'auto', ...frosted,
|
|
maxWidth: '100%', overflowX: 'auto', scrollbarWidth: 'none',
|
|
}}>
|
|
{categories.core.map(segment)}
|
|
{categories.plugin.length > 0 && (
|
|
<hr
|
|
aria-orientation="vertical"
|
|
aria-label={t('poi.pluginCategories')}
|
|
style={{ flexShrink: 0, width: 1, height: 20, margin: '0 3px', border: 'none', background: 'var(--border-primary)' }}
|
|
/>
|
|
)}
|
|
{categories.plugin.map(segment)}
|
|
</div>
|
|
|
|
{(moved || anyError) && active.size > 0 && (
|
|
<button
|
|
type="button"
|
|
onClick={onSearchArea}
|
|
className="text-content"
|
|
style={{
|
|
display: 'inline-flex', alignItems: 'center', gap: 6,
|
|
padding: '6px 13px', borderRadius: 999, border: 'none', cursor: 'pointer',
|
|
fontSize: 'calc(12px * var(--fs-scale-caption, 1))', fontWeight: 600, fontFamily: 'inherit', pointerEvents: 'auto',
|
|
color: anyError ? '#ef4444' : undefined,
|
|
...frosted,
|
|
}}
|
|
>
|
|
{anyError
|
|
? <AlertTriangle size={13} strokeWidth={2.4} />
|
|
: <RotateCw size={13} strokeWidth={2.4} />}
|
|
{t('poi.searchThisArea')}
|
|
</button>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|