mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-20 11:06:06 +00:00
0f42b8b8ae
Keeping the whole right inset clear gave up a strip of the full height for a capsule that only sits in the corner. The iOS app now measures an element in a top corner (iOS 26 safe area with corner adaptation, vertical against horizontal) and hands its reach and width to the page: the floating bars stand beside it, the page keeps the full width and starts below it. Without such an element, on every other device and before iOS 26, nothing changes.
117 lines
6.4 KiB
TypeScript
117 lines
6.4 KiB
TypeScript
import { readFileSync } from 'node:fs';
|
|
import { resolve } from 'node:path';
|
|
import { describe, expect, it } from 'vitest';
|
|
import MGlassBar from '../../../src/mobile/components/MGlassBar';
|
|
import { render, screen } from '../../helpers/render';
|
|
|
|
// FE-MOB-CHROME-001 onwards: the touch shell's own chrome against what the
|
|
// desktop pages bring along.
|
|
|
|
const root = resolve(__dirname, '../../..');
|
|
|
|
describe('desktop chrome inside the touch shell', () => {
|
|
it('FE-MOB-CHROME-001: a page without a phone screen shows no desktop navbar over the rail, and keeps no room for it', () => {
|
|
// /plugins/:id, /help and a trip's files still render through PageShell. jsdom
|
|
// applies no stylesheet, so the rule and the mark it needs are read from source.
|
|
const css = readFileSync(resolve(root, 'src/mobile/mobile.css'), 'utf8');
|
|
expect(css).toMatch(/html:has\(\.m-shell\) \{\s*--nav-h: 0px;\s*\}/);
|
|
expect(css).toMatch(/html:has\(\.m-shell\) \[data-desktop-navbar\] \{\s*display: none;\s*\}/);
|
|
const navbar = readFileSync(resolve(root, 'src/components/Layout/Navbar.tsx'), 'utf8');
|
|
expect(navbar).toContain('data-desktop-navbar=""');
|
|
});
|
|
});
|
|
|
|
describe('MGlassBar', () => {
|
|
it('FE-MOB-CHROME-002: a floating bar stands in the content column, padded and capped like it', () => {
|
|
render(
|
|
<MGlassBar column="wide:max-w-[1280px]">
|
|
<span>bar</span>
|
|
</MGlassBar>
|
|
);
|
|
const bar = screen.getByText('bar').parentElement as HTMLElement;
|
|
const column = bar.parentElement as HTMLElement;
|
|
expect(column.className).toContain('px-4');
|
|
expect(column.className).toContain('wide:px-6');
|
|
expect(column.className).toContain('wide:max-w-[1280px]');
|
|
expect(column.parentElement?.className).toContain('m-span-x');
|
|
// The strip around the bar lets taps through to the page.
|
|
expect(column.parentElement?.className).toContain('pointer-events-none');
|
|
expect(bar.className).toContain('pointer-events-auto');
|
|
});
|
|
|
|
it('FE-MOB-CHROME-003: in flow it is the bar alone', () => {
|
|
const { container } = render(
|
|
<MGlassBar floating={false}>
|
|
<span>bar</span>
|
|
</MGlassBar>
|
|
);
|
|
expect(container.firstElementChild).toBe(screen.getByText('bar').parentElement);
|
|
});
|
|
});
|
|
|
|
describe('safe area in the touch shell', () => {
|
|
// jsdom applies no stylesheet and has no env(), so the rules are read from source.
|
|
const css = readFileSync(resolve(root, 'src/mobile/mobile.css'), 'utf8');
|
|
|
|
it('FE-MOB-CHROME-004: the top clearance takes env() with the measurement of the app as a floor, never in its place', () => {
|
|
expect(css).toContain('--m-safe-t: max(env(safe-area-inset-top, 0px), var(--trek-native-safe-top, 0px));');
|
|
expect(css).toContain('--m-safe-top: calc(var(--m-safe-t) + 12px);');
|
|
expect(css).toContain('--m-safe-l: max(env(safe-area-inset-left, 0px), var(--trek-native-safe-left, 0px));');
|
|
expect(css).toContain('--m-safe-r: max(env(safe-area-inset-right, 0px), var(--trek-native-safe-right, 0px));');
|
|
});
|
|
|
|
it('FE-MOB-CHROME-005: without the rail the floating bars keep clear of a side inset, such as a camera in a corner', () => {
|
|
const narrow = "html:not(:has(.m-shell[data-size='wide'], .m-shell[data-size='split'])) :is(.m-bar-x, .m-span-x) {";
|
|
const rule = css.split(narrow)[1]?.split('}')[0] ?? '';
|
|
expect(rule).toContain('margin-inline: var(--m-safe-l-gap, 0px) var(--m-safe-r-gap, 0px);');
|
|
// The insets are the screen's: right to left takes them the other way round.
|
|
const rtl = css.split(`html[dir='rtl']${narrow.slice('html'.length)}`)[1]?.split('}')[0] ?? '';
|
|
expect(rtl).toContain('margin-inline: var(--m-safe-r-gap, 0px) var(--m-safe-l-gap, 0px);');
|
|
// On a wide window the bars keep no side margin, so mx-auto still centres them.
|
|
for (const cls of ['m-bar-x', 'm-span-x']) {
|
|
expect(css.split(`\n.${cls} {`)[1]?.split('}')[0] ?? '').not.toContain('margin');
|
|
}
|
|
});
|
|
|
|
it('FE-MOB-CHROME-006: a side inset gets a little air, and none where there is no inset', () => {
|
|
expect(css).toContain('--m-safe-r-gap: calc(var(--m-bar-r) + min(var(--m-bar-r), 8px));');
|
|
expect(css).toContain('--m-safe-l-gap: calc(var(--m-bar-l) + min(var(--m-bar-l), 8px));');
|
|
});
|
|
|
|
it('FE-MOB-CHROME-007: on a wide window the bars end before the trailing inset, by their box, not a margin', () => {
|
|
const wide = "html:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-bar-x {";
|
|
expect(css.split(wide)[1]?.split('}')[0] ?? '').toContain(
|
|
'inset-inline-end: calc(16px + var(--m-safe-r-gap, 0px));'
|
|
);
|
|
const rtl = `html[dir='rtl']:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-bar-x {`;
|
|
expect(css.split(rtl)[1]?.split('}')[0] ?? '').toContain(
|
|
'inset-inline-end: calc(16px + var(--m-safe-l-gap, 0px));'
|
|
);
|
|
});
|
|
|
|
it('FE-MOB-CHROME-008: the page keeps clear of the side insets, the leading one left to the rail on a wide window', () => {
|
|
expect(css.split('\n.m-page {')[1]?.split('}')[0] ?? '').toContain(
|
|
'margin-inline: var(--m-page-l, 0px) var(--m-page-r, 0px);'
|
|
);
|
|
expect(css.split("html[dir='rtl'] .m-page {")[1]?.split('}')[0] ?? '').toContain(
|
|
'margin-inline: var(--m-page-r, 0px) var(--m-page-l, 0px);'
|
|
);
|
|
const wide = "html:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-page {";
|
|
expect(css.split(wide)[1]?.split('}')[0] ?? '').toContain('margin-inline-start: 0;');
|
|
});
|
|
|
|
it('FE-MOB-CHROME-009: an element in a top corner moves the bars beside it and the page below it, not a whole strip aside', () => {
|
|
// The bars avoid the wider of the side inset and the corner element.
|
|
expect(css).toContain('--m-bar-r: max(var(--m-safe-r), var(--trek-native-corner-right, 0px));');
|
|
expect(css).toContain('--m-bar-l: max(var(--m-safe-l), var(--trek-native-corner-left, 0px));');
|
|
// The page gives the corner's width back and starts below the corner instead.
|
|
expect(css).toContain('--m-page-r: max(0px, var(--m-safe-r) - var(--trek-native-corner-right, 0px));');
|
|
expect(css).toContain('--m-page-l: max(0px, var(--m-safe-l) - var(--trek-native-corner-left, 0px));');
|
|
expect(css.split('\n.m-page {')[1]?.split('}')[0] ?? '').toContain(
|
|
'padding-top: max(0px, calc(var(--m-corner-b, 0px) + 12px - var(--m-safe-top, 12px) - 70px));'
|
|
);
|
|
// Without a corner element (every other device, iOS before 26) nothing moves.
|
|
expect(css).toContain('--m-corner-b: var(--trek-native-corner-bottom, 0px);');
|
|
});
|
|
});
|