{/* Selected person card */}
{v.selectedUser && stat && (
diff --git a/client/tests/unit/mobile/MSheet.test.tsx b/client/tests/unit/mobile/MSheet.test.tsx
index 2eece0357..31753975d 100644
--- a/client/tests/unit/mobile/MSheet.test.tsx
+++ b/client/tests/unit/mobile/MSheet.test.tsx
@@ -507,7 +507,7 @@ describe('MSheet', () => {
body
,
);
- expect(region().className).toContain('top-[var(--m-safe-top,12px)]');
+ expect(region().className).toContain('top-[max(var(--m-safe-top,12px),var(--m-corner-clear,0px))]');
expect(region().className).toContain('bottom-[calc(var(--bottom-nav-h,84px)+12px)]');
expect(panel().className).toContain('max-h-full');
});
diff --git a/client/tests/unit/mobile/shellChrome.test.tsx b/client/tests/unit/mobile/shellChrome.test.tsx
index a031795e3..d8ba3b0bc 100644
--- a/client/tests/unit/mobile/shellChrome.test.tsx
+++ b/client/tests/unit/mobile/shellChrome.test.tsx
@@ -108,9 +108,58 @@ describe('safe area in the touch shell', () => {
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));'
+ 'padding-top: max(0px, calc(var(--m-corner-clear, 0px) + 2px - var(--m-safe-top, 12px) - 70px));'
);
+ expect(css).toContain('--m-corner-clear: calc(var(--m-corner-b) + min(var(--m-corner-b), 10px));');
// Without a corner element (every other device, iOS before 26) nothing moves.
expect(css).toContain('--m-corner-b: var(--trek-native-corner-bottom, 0px);');
});
+
+ it('FE-MOB-CHROME-010: on a wide window the page ends before a corner element instead of starting below it', () => {
+ const wideRoot = "html:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-root {";
+ const block = css.split(wideRoot)[1]?.split('}')[0] ?? '';
+ expect(block).toContain('--m-corner-clear: 0px;');
+ expect(block).toContain('--m-corner-side-r: var(--m-corner-r-gap);');
+ expect(block).toContain('--m-rail-w: calc(var(--m-bar-l) + 100px);');
+ const widePage = "html:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-page {";
+ expect(css.split(widePage)[1]?.split('}')[0] ?? '').toContain(
+ 'margin-inline-end: max(var(--m-page-r, 0px), var(--m-corner-side-r, 0px));'
+ );
+ // Right to left the rail stands on the corner's side and takes it.
+ const rtlRoot = "html[dir='rtl']:has(.m-shell[data-size='wide'], .m-shell[data-size='split']) .m-root {";
+ const rtl = css.split(rtlRoot)[1]?.split('}')[0] ?? '';
+ expect(rtl).toContain('--m-rail-w: calc(var(--m-bar-r) + 100px);');
+ expect(rtl).toContain('--m-corner-side-r: 0px;');
+ });
+
+ it('FE-MOB-CHROME-011: the screens that place their own controls keep them beside a corner element and their content below it', () => {
+ const corner = readFileSync(resolve(root, 'src/mobile/corner.css'), 'utf8');
+ expect(corner).toMatch(
+ /\.m-corner-beside \{\s*margin-inline: var\(--m-corner-l-gap, 0px\) var\(--m-corner-r-gap, 0px\);/
+ );
+ // The element stays where the hardware has it, so right to left swaps the sides back.
+ expect(corner).toMatch(
+ /html\[dir='rtl'\] \.m-corner-beside \{\s*margin-inline: var\(--m-corner-r-gap, 0px\) var\(--m-corner-l-gap, 0px\);/
+ );
+ expect(corner).toMatch(
+ /\.m-corner-side \{\s*margin-inline: var\(--m-corner-side-l, 0px\) var\(--m-corner-side-r, 0px\);/
+ );
+ expect(css).toMatch(/\.m-page:has\(\.m-corner-own\) \{\s*padding-top: 0;/);
+ expect(readFileSync(resolve(root, 'src/mobile/MobileShell.tsx'), 'utf8')).toContain("import './corner.css'");
+ const src = (file: string) => readFileSync(resolve(root, 'src', file), 'utf8');
+ const shell = src('mobile/screens/trip/MTripShell.tsx');
+ // The top row and the day chips stand beside it, a list tab ends before it on a wide window.
+ expect(src('mobile/screens/trip/MTripShellParts.tsx')).toContain("CHROME_ROW = 'm-corner-beside absolute end-4");
+ expect(shell.match(/\$\{CHROME_ROW\}/g)).toHaveLength(2);
+ expect(shell).toContain('
');
+ expect(src('mobile/screens/trip/map/MMapArea.tsx')).toContain('m-corner-beside pointer-events-none absolute end-4');
+ // A list tab's first row and a docked sheet start below it.
+ expect(src('mobile/screens/trip/tabs/tabChrome.tsx')).toContain(
+ 'pt-[max(calc(var(--m-safe-top,12px)+58px),var(--m-corner-clear,0px))]'
+ );
+ expect(src('mobile/components/MSheet.tsx')).toContain(
+ 'top-[max(calc(var(--m-safe-top,12px)+56px),var(--m-corner-clear,0px))]'
+ );
+ expect(src('mobile/components/MSectionNav.tsx')).toContain("'m-corner-flow px-4 ");
+ });
});
diff --git a/client/tests/unit/mobile/trip/MRoadtripTab.test.tsx b/client/tests/unit/mobile/trip/MRoadtripTab.test.tsx
index 710c77817..2526d1f98 100644
--- a/client/tests/unit/mobile/trip/MRoadtripTab.test.tsx
+++ b/client/tests/unit/mobile/trip/MRoadtripTab.test.tsx
@@ -600,7 +600,7 @@ describe('MRoadtripTab', () => {
const scroller = container.querySelector('[class*="overflow-y-auto"]') as HTMLElement
// 96px band plus a 44px bar plus its gap. A padding left at the old 102 would
// put the head card's first line behind the glass.
- expect(scroller.className).toContain('pt-[calc(var(--m-safe-top,12px)+150px)]')
+ expect(scroller.className).toContain('pt-[max(calc(var(--m-safe-top,12px)+150px),var(--m-corner-clear,0px))]')
})
it('FE-MOB-RTTAB-031: no stage, no search bar, and the chain keeps its old top', () => {
// Without a stage the corridor falls back to the trip's first routed day, which
@@ -610,7 +610,7 @@ describe('MRoadtripTab', () => {
expect(screen.queryByText('roadtrip.poi.title')).toBeNull()
const scroller = container.querySelector('[class*="overflow-y-auto"]') as HTMLElement
- expect(scroller.className).toContain('pt-[calc(var(--m-safe-top,12px)+102px)]')
+ expect(scroller.className).toContain('pt-[max(calc(var(--m-safe-top,12px)+102px),var(--m-corner-clear,0px))]')
})
})