mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-14 00:01:03 +00:00
5346182807
From the large-screen review (visual findings of the shell and the top-level screens): - Rail: 80px wide, one caption size for every name (no shrinking per item), balanced two-line names with every entry as tall as the tallest, short rail names where a language's word is too long (mobileNav.rail*, all locales), and near-opaque glass so a map's colours no longer smear through it. - Rail head: always one 56px circle, so the entries never jump between pages: the create action, the screen's own action (the vacation calendar's year/editor switch moves there instead of floating over the days) or the quiet logo on settings and administration. It stays put while a short rail scrolls. - Vacation calendar: weekday letters over each month on a wide window; the editor's mode switch sits at the foot with room kept for it. - Docks: More is marked with a ring rather than the centre button's fill, the dock glass is denser, and lists fade out under the dock instead of showing in the gap below it. - Dashboard: trip names get the card's width with the dates under them, the hero's facts wrap as whole chips, the filter chips scroll with a fade, the hero ends above the dock on a phone on its side and its buttons sit on a dark ground; the header bar stands in the content's column. - Journeys: on a wide window the header is the same glass bar, in the column of the cards, and the other journeys' label starts with them. - Notifications: the round chevron back button, in the list's column. - Settings and administration share one frame and width. Admin's new-user action sits under the section list's title, the users card header wraps inside the card, stat labels ellipsize, role badges read in dark mode. - Collections: one card per place with the status inside it, worded in a readable mix of its colour. - Atlas and the journey map frame clear of the rail and the header; the journey's day bar sits on a glass plate, and a phone on its side gets smaller cards. - Rail label tests rewritten for the new rule; FE-MOB-PANES-016 duplicate renumbered to 017.
284 lines
12 KiB
TypeScript
284 lines
12 KiB
TypeScript
import React from 'react';
|
|
import { describe, it, expect, beforeEach } from 'vitest';
|
|
import { useLocation } from 'react-router';
|
|
import { render, screen, fireEvent } from '../../helpers/render';
|
|
import MBottomNav from '../../../src/mobile/components/MBottomNav';
|
|
import { useAddonStore } from '../../../src/store/addonStore';
|
|
import { usePluginStore } from '../../../src/store/pluginStore';
|
|
import { useSettingsStore } from '../../../src/store/settingsStore';
|
|
import { DEFAULT_APPEARANCE } from '@trek/shared';
|
|
|
|
function LocationEcho() {
|
|
const location = useLocation();
|
|
return <span data-testid="loc">{location.pathname + location.search}</span>;
|
|
}
|
|
|
|
const nav = (entry: string) =>
|
|
render(<><MBottomNav /><LocationEcho /></>, { initialEntries: [entry] });
|
|
|
|
const at = () => screen.getByTestId('loc').textContent;
|
|
|
|
// FE-MOB-NAV-001 onwards
|
|
|
|
function seedAddons(ids: string[]) {
|
|
useAddonStore.setState({
|
|
addons: ids.map((id) => ({ id, name: id, type: 'global', icon: 'globe', enabled: true })),
|
|
loaded: true,
|
|
});
|
|
}
|
|
|
|
type MobileNavCfg = { bar: string[]; more: string[] } | null;
|
|
|
|
/** A dock split as the Appearance customizer persists it; null = un-customised. */
|
|
function seedMobileNav(cfg: MobileNavCfg) {
|
|
const { settings } = useSettingsStore.getState();
|
|
useSettingsStore.setState({
|
|
settings: {
|
|
...settings,
|
|
appearance: { ...DEFAULT_APPEARANCE, mobileNav: cfg ?? { bar: [], more: [] } },
|
|
},
|
|
});
|
|
}
|
|
|
|
/** [left group, centre slot, right group] of the dock, in DOM order. */
|
|
function dockSlots(container: HTMLElement) {
|
|
const dock = container.querySelector('nav') as HTMLElement;
|
|
const [left, centre, right] = Array.from(dock.children) as HTMLElement[];
|
|
return { count: dock.children.length, left, centre, right };
|
|
}
|
|
|
|
describe('MBottomNav', () => {
|
|
beforeEach(() => {
|
|
useAddonStore.setState({ addons: [], loaded: true });
|
|
usePluginStore.setState({ plugins: [], loaded: true });
|
|
seedMobileNav(null);
|
|
});
|
|
|
|
it('FE-MOB-NAV-001: renders the dashboard tab plus enabled global addons', () => {
|
|
seedAddons(['vacay', 'atlas']);
|
|
render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
|
|
expect(screen.getByRole('button', { name: 'My Trips' })).toBeInTheDocument();
|
|
expect(screen.getByRole('button', { name: 'Vacay' })).toBeInTheDocument();
|
|
expect(screen.getByRole('button', { name: 'Atlas' })).toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-002: omits tabs for addons that are not enabled', () => {
|
|
render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
|
|
expect(screen.getByRole('button', { name: 'My Trips' })).toBeInTheDocument();
|
|
expect(screen.queryByRole('button', { name: 'Atlas' })).not.toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-003: marks the current route as the active tab', () => {
|
|
seedAddons(['atlas']);
|
|
render(<MBottomNav />, { initialEntries: ['/atlas'] });
|
|
|
|
expect(screen.getByRole('button', { name: 'Atlas' })).toHaveAttribute('aria-current', 'page');
|
|
expect(screen.getByRole('button', { name: 'My Trips' })).not.toHaveAttribute('aria-current');
|
|
});
|
|
|
|
it('FE-MOB-NAV-004: the "+" creates a trip on the dashboard', () => {
|
|
render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
expect(screen.getByRole('button', { name: 'New Trip' })).toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-005: the "+" follows the persisted trip tab inside a trip', () => {
|
|
sessionStorage.setItem('trip-tab-7', 'buchungen');
|
|
render(<MBottomNav />, { initialEntries: ['/trips/7'] });
|
|
expect(screen.getByRole('button', { name: 'Manual Booking' })).toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-006: atlas and collections live in the More popover, not the dock', () => {
|
|
seedAddons(['vacay', 'atlas', 'journey', 'collections']);
|
|
render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
|
|
expect(screen.queryByRole('button', { name: 'Atlas' })).not.toBeInTheDocument();
|
|
fireEvent.click(screen.getByRole('button', { expanded: false }));
|
|
expect(screen.getByRole('button', { name: /Atlas/ })).toBeInTheDocument();
|
|
expect(screen.getByRole('button', { name: /Collections/ })).toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-006b: the dock keeps Journey next to Vacay when both are enabled', () => {
|
|
seedAddons(['vacay', 'atlas', 'journey', 'collections']);
|
|
render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
|
|
expect(screen.getByRole('button', { name: 'Journey' })).toBeInTheDocument();
|
|
expect(screen.getByRole('button', { name: 'Vacay' })).toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-006c: an instance without the journey addon keeps the Vacay/Atlas dock', () => {
|
|
seedAddons(['vacay', 'atlas', 'collections']);
|
|
render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
|
|
expect(screen.getByRole('button', { name: 'Vacay' })).toBeInTheDocument();
|
|
expect(screen.getByRole('button', { name: 'Atlas' })).toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-007: no More slot without popover entries', () => {
|
|
seedAddons(['vacay', 'atlas']);
|
|
render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
expect(screen.queryByRole('button', { expanded: false })).not.toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-008: the centre button opens the country search on the atlas', () => {
|
|
seedAddons(['atlas']);
|
|
render(<MBottomNav />, { initialEntries: ['/atlas'] });
|
|
expect(screen.getByRole('button', { name: 'Search a country...' })).toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-009: settings shows the disabled logo slot instead of a create action', () => {
|
|
render(<MBottomNav />, { initialEntries: ['/settings'] });
|
|
expect(screen.queryByRole('button', { name: 'New Trip' })).not.toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-010: admin also swaps the "+" for the logo slot', () => {
|
|
render(<MBottomNav />, { initialEntries: ['/admin'] });
|
|
expect(screen.queryByRole('button', { name: 'New Trip' })).not.toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-011: choosing a More entry navigates and closes the popover', () => {
|
|
seedAddons(['vacay', 'atlas', 'journey', 'collections']);
|
|
render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
|
|
fireEvent.click(screen.getByRole('button', { name: 'More' }));
|
|
fireEvent.click(screen.getByRole('button', { name: /Atlas/ }));
|
|
|
|
const more = screen.getByRole('button', { name: 'More' });
|
|
expect(more).toHaveAttribute('aria-expanded', 'false');
|
|
expect(more).toHaveAttribute('aria-current', 'page');
|
|
});
|
|
|
|
it('FE-MOB-NAV-012: tapping the scrim closes the More popover again', () => {
|
|
seedAddons(['vacay', 'atlas', 'journey', 'collections']);
|
|
const { container } = render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
|
|
fireEvent.click(screen.getByRole('button', { name: 'More' }));
|
|
const scrim = container.querySelector('.fixed.inset-0') as HTMLElement;
|
|
|
|
fireEvent.click(scrim);
|
|
|
|
expect(screen.getByRole('button', { name: 'More' })).toHaveAttribute('aria-expanded', 'false');
|
|
expect(screen.queryByRole('button', { name: /Collections/ })).not.toBeInTheDocument();
|
|
});
|
|
|
|
it('FE-MOB-NAV-013: a click inside the popover does not close it', () => {
|
|
seedAddons(['vacay', 'atlas', 'journey', 'collections']);
|
|
const { container } = render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
|
|
fireEvent.click(screen.getByRole('button', { name: 'More' }));
|
|
fireEvent.click(container.querySelector('.fixed.inset-0 > div') as HTMLElement);
|
|
|
|
expect(screen.getByRole('button', { name: /Journey/ })).toBeInTheDocument();
|
|
});
|
|
|
|
it.each([
|
|
['/journey', 'New Journey', '/journey?create=1'],
|
|
['/journey/4', 'Add Entry', '/journey/4?create=entry'],
|
|
['/collections', 'Add a place', '/collections?create=place'],
|
|
['/trips/7', 'Add Place/Activity', '/trips/7?create=place'],
|
|
['/dashboard', 'New Trip', '/dashboard?create=1'],
|
|
['/atlas', 'Search a country...', '/atlas?search=1'],
|
|
])('FE-MOB-NAV-014: the "+" on %s runs "%s"', (route, label, target) => {
|
|
seedAddons(['journey', 'collections', 'atlas']);
|
|
nav(route);
|
|
|
|
fireEvent.click(screen.getByRole('button', { name: label }));
|
|
|
|
expect(at()).toBe(target);
|
|
});
|
|
|
|
it.each([
|
|
['finanzplan', 'Add expense', '/trips/7?create=expense'],
|
|
['transports', 'Transport', '/trips/7?create=transport'],
|
|
['buchungen', 'Manual Booking', '/trips/7?create=reservation'],
|
|
])('FE-MOB-NAV-015: the trip "+" follows the %s tab', (tab, label, target) => {
|
|
sessionStorage.setItem('trip-tab-7', tab);
|
|
nav('/trips/7');
|
|
|
|
fireEvent.click(screen.getByRole('button', { name: label }));
|
|
|
|
expect(at()).toBe(target);
|
|
});
|
|
|
|
it('FE-MOB-NAV-016: a dock tab navigates to its route', () => {
|
|
seedAddons(['vacay', 'atlas']);
|
|
nav('/dashboard');
|
|
|
|
fireEvent.click(screen.getByRole('button', { name: 'Atlas' }));
|
|
|
|
expect(at()).toBe('/atlas');
|
|
});
|
|
|
|
it('FE-MOB-NAV-017: a More entry navigates to its route', () => {
|
|
seedAddons(['vacay', 'atlas', 'journey', 'collections']);
|
|
nav('/dashboard');
|
|
|
|
fireEvent.click(screen.getByRole('button', { name: 'More' }));
|
|
fireEvent.click(screen.getByRole('button', { name: /Collections/ }));
|
|
|
|
expect(at()).toBe('/collections');
|
|
});
|
|
|
|
it('FE-MOB-NAV-018: vacay owns its centre slot, so the dock offers no create action (#1811)', () => {
|
|
seedAddons(['vacay', 'atlas']);
|
|
const { container } = render(<MBottomNav />, { initialEntries: ['/vacay'] });
|
|
|
|
expect(screen.queryByRole('button', { name: 'New Trip' })).not.toBeInTheDocument();
|
|
// Nothing tappable in the middle at all: the screen's own FAB covers it, and
|
|
// until it mounts an empty slot beats a wrong action.
|
|
expect(dockSlots(container).centre).toBeEmptyDOMElement();
|
|
expect(screen.getByRole('button', { name: 'Vacay' })).toHaveAttribute('aria-current', 'page');
|
|
});
|
|
|
|
const DOCK_CONFIGS: [string, MobileNavCfg][] = [
|
|
['the built-in dock', null],
|
|
['vacay pinned alone', { bar: ['vacay'], more: ['atlas', 'journey', 'collections'] }],
|
|
['vacay demoted to More', { bar: ['journey', 'collections'], more: ['vacay', 'atlas'] }],
|
|
];
|
|
|
|
it.each(DOCK_CONFIGS)('FE-MOB-NAV-019: the empty vacay slot keeps the FAB geometry (%s)', (_label, cfg) => {
|
|
seedAddons(['vacay', 'atlas', 'journey', 'collections']);
|
|
seedMobileNav(cfg);
|
|
|
|
const dashboard = render(<MBottomNav />, { initialEntries: ['/dashboard'] });
|
|
const withFab = dockSlots(dashboard.container);
|
|
const groups = [withFab.left.children.length, withFab.right.children.length];
|
|
const fabClasses = withFab.centre.className.split(' ');
|
|
const slots = withFab.count;
|
|
dashboard.unmount();
|
|
|
|
const vacay = render(<MBottomNav />, { initialEntries: ['/vacay'] });
|
|
const placeholder = dockSlots(vacay.container);
|
|
|
|
expect(placeholder.count).toBe(slots);
|
|
// Same 56px box as MFab, so both tab groups stay symmetric around the centre.
|
|
['mx-2', 'h-14', 'w-14', 'flex-none'].forEach((cls) => {
|
|
expect(fabClasses).toContain(cls);
|
|
expect(placeholder.centre).toHaveClass(cls);
|
|
});
|
|
expect([placeholder.left.children.length, placeholder.right.children.length]).toEqual(groups);
|
|
});
|
|
|
|
it("FE-MOB-NAV-020: More is marked for its screens with a ring, not the centre button's fill", () => {
|
|
seedAddons(['vacay', 'atlas', 'journey', 'collections']);
|
|
nav('/atlas');
|
|
const more = screen.getByRole('button', { name: 'More' });
|
|
expect(more).toHaveAttribute('aria-current', 'page');
|
|
expect(more.className).toContain('ring-[color:var(--m-act)]');
|
|
expect(more.className).not.toContain('bg-m-act');
|
|
});
|
|
|
|
it('FE-MOB-NAV-021: a list fades out under the dock, a map runs to the edge', () => {
|
|
seedAddons(['atlas', 'journey']);
|
|
const dashboard = nav('/dashboard');
|
|
expect(dashboard.container.querySelector('.m-dock-scrim')).toBeInTheDocument();
|
|
dashboard.unmount();
|
|
for (const path of ['/atlas', '/journey/3']) {
|
|
const screenOverMap = nav(path);
|
|
expect([path, screenOverMap.container.querySelector('.m-dock-scrim')]).toEqual([path, null]);
|
|
screenOverMap.unmount();
|
|
}
|
|
});
|
|
});
|