mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-21 11:36:05 +00:00
feat(mobile): page transitions, pull-to-refresh, share sheet and haptics
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.
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
import { Haptics, ImpactStyle, NotificationType } from '@capacitor/haptics';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { tickHaptic, toastHaptic } from './haptics';
|
||||
import { pressHaptic, selectionHaptic, tickHaptic, toastHaptic } from './haptics';
|
||||
import { isNativeApp } from './platform';
|
||||
|
||||
vi.mock('@capacitor/haptics', () => ({
|
||||
Haptics: { notification: vi.fn(), impact: vi.fn() },
|
||||
ImpactStyle: { Light: 'LIGHT' },
|
||||
Haptics: { notification: vi.fn(), impact: vi.fn(), selectionChanged: vi.fn() },
|
||||
ImpactStyle: { Light: 'LIGHT', Medium: 'MEDIUM' },
|
||||
NotificationType: { Success: 'SUCCESS', Warning: 'WARNING', Error: 'ERROR' },
|
||||
}));
|
||||
vi.mock('./platform', () => ({ isNativeApp: vi.fn() }));
|
||||
@@ -13,6 +13,7 @@ vi.mock('./platform', () => ({ isNativeApp: vi.fn() }));
|
||||
beforeEach(() => {
|
||||
vi.mocked(Haptics.notification).mockReset().mockResolvedValue();
|
||||
vi.mocked(Haptics.impact).mockReset().mockResolvedValue();
|
||||
vi.mocked(Haptics.selectionChanged).mockReset().mockResolvedValue();
|
||||
vi.mocked(isNativeApp).mockReturnValue(true);
|
||||
});
|
||||
|
||||
@@ -57,3 +58,17 @@ describe('tickHaptic', () => {
|
||||
expect(Haptics.impact).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe('selectionHaptic and pressHaptic', () => {
|
||||
it('click on a changed value and bump on a long press, in the app only', () => {
|
||||
selectionHaptic();
|
||||
pressHaptic();
|
||||
expect(Haptics.selectionChanged).toHaveBeenCalledTimes(1);
|
||||
expect(Haptics.impact).toHaveBeenCalledWith({ style: ImpactStyle.Medium });
|
||||
vi.mocked(isNativeApp).mockReturnValue(false);
|
||||
selectionHaptic();
|
||||
pressHaptic();
|
||||
expect(Haptics.selectionChanged).toHaveBeenCalledTimes(1);
|
||||
expect(Haptics.impact).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -27,3 +27,21 @@ export function tickHaptic(): void {
|
||||
if (!isNativeApp()) return;
|
||||
Haptics.impact({ style: ImpactStyle.Light }).catch(reportNativeFailure);
|
||||
}
|
||||
|
||||
/**
|
||||
* The selection click a native switch, segmented control or picker gives when
|
||||
* its value changes. Does nothing in a browser.
|
||||
*/
|
||||
export function selectionHaptic(): void {
|
||||
if (!isNativeApp()) return;
|
||||
Haptics.selectionChanged().catch(reportNativeFailure);
|
||||
}
|
||||
|
||||
/**
|
||||
* The firmer bump of a long press that opens a context menu, or of an item
|
||||
* picked up to drag. Does nothing in a browser.
|
||||
*/
|
||||
export function pressHaptic(): void {
|
||||
if (!isNativeApp()) return;
|
||||
Haptics.impact({ style: ImpactStyle.Medium }).catch(reportNativeFailure);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
import { Share } from '@capacitor/share';
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
import { isNativeApp } from './platform';
|
||||
import { reportNativeFailure } from './reportFailure';
|
||||
import { canShareLink, shareLink } from './shareLink';
|
||||
|
||||
vi.mock('@capacitor/share', () => ({ Share: { share: vi.fn() } }));
|
||||
vi.mock('./platform', () => ({ isNativeApp: vi.fn() }));
|
||||
vi.mock('./reportFailure', () => ({ reportNativeFailure: vi.fn() }));
|
||||
vi.mock('../utils/fileShare', () => ({ canShareText: vi.fn(() => false) }));
|
||||
|
||||
beforeEach(() => {
|
||||
vi.mocked(Share.share).mockReset().mockResolvedValue({ activityType: undefined });
|
||||
vi.mocked(reportNativeFailure).mockClear();
|
||||
vi.mocked(isNativeApp).mockReturnValue(true);
|
||||
});
|
||||
|
||||
describe('shareLink', () => {
|
||||
it('uses the native sheet inside the app', async () => {
|
||||
expect(canShareLink()).toBe(true);
|
||||
expect(await shareLink('https://trek.example/s/abc', 'Trip')).toBe(true);
|
||||
expect(Share.share).toHaveBeenCalledWith({ url: 'https://trek.example/s/abc', title: 'Trip', dialogTitle: 'Trip' });
|
||||
});
|
||||
|
||||
it('treats a closed sheet as no share, without a failure report', async () => {
|
||||
vi.mocked(Share.share).mockRejectedValue(new Error('Share canceled'));
|
||||
expect(await shareLink('https://trek.example/s/abc')).toBe(false);
|
||||
expect(reportNativeFailure).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('falls back to the Web Share API in a browser, and offers nothing without one', async () => {
|
||||
vi.mocked(isNativeApp).mockReturnValue(false);
|
||||
expect(canShareLink()).toBe(false);
|
||||
const share = vi.fn(async () => {});
|
||||
vi.stubGlobal('navigator', { share });
|
||||
expect(await shareLink('https://trek.example/s/abc')).toBe(true);
|
||||
expect(share).toHaveBeenCalledWith({ url: 'https://trek.example/s/abc', title: undefined });
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,33 @@
|
||||
import { Share } from '@capacitor/share';
|
||||
import { canShareText } from '../utils/fileShare';
|
||||
import { isNativeApp } from './platform';
|
||||
import { reportNativeFailure } from './reportFailure';
|
||||
|
||||
/**
|
||||
* Handing a link to the system share sheet, the way a native app offers
|
||||
* "Share…" next to "Copy": Messages, Mail, AirDrop, WhatsApp. Inside the apps
|
||||
* through Capacitor's Share, in a browser through the Web Share API where it
|
||||
* exists. Where neither does, `canShareLink` is false and the caller shows
|
||||
* only the copy button.
|
||||
*/
|
||||
export function canShareLink(): boolean {
|
||||
return isNativeApp() || canShareText();
|
||||
}
|
||||
|
||||
/** True when a target took the link, false when the sheet was closed or failed. */
|
||||
export async function shareLink(url: string, title?: string): Promise<boolean> {
|
||||
try {
|
||||
if (isNativeApp()) {
|
||||
await Share.share({ url, title, dialogTitle: title });
|
||||
return true;
|
||||
}
|
||||
await navigator.share({ url, title });
|
||||
return true;
|
||||
} catch (err) {
|
||||
// Closing the sheet rejects too; only a real failure is worth a report.
|
||||
const name = (err as { name?: string; message?: string } | null)?.name ?? '';
|
||||
const message = (err as { message?: string } | null)?.message ?? '';
|
||||
if (name !== 'AbortError' && !/cancel/i.test(message)) reportNativeFailure(err);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user