mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-20 19:16:08 +00:00
feat(mobile): the trip's tabs, administration, collections and the journal use the large screen
On an iPad or an unfolded foldable the list screens kept one phone-wide column in the middle of the page. They now lay out for the room they have: - Transports, bookings, polls and tasks put their cards in a grid of as many phone-wide columns as the page holds (CardGrid), three on a 13" iPad on its side, two upright, one in a narrow Split View. - Costs: with room for two panes (split size class) the summary (total, owe and owed, settle up, final budget, categories) stands in a pane of its own beside the expenses, each scrolling on its own (TabPanes). The search field sits in the expenses' column again instead of running past it. - Files: a grid of tiles with each photo's picture; with room for two panes the picked file is previewed beside the grid with what it belongs to and its actions, the way Files on an iPad does. The signed preview address comes through fileRepo.previewUrl. - Packing: the categories stand in columns, each card whole in its column; the action menu drops from its button at a popover's width. - To-dos: the four smart filters as tiles and the trip's lists in a pane beside the tasks, which take the filter's name as their head. - Collab: the chat stays in view at the trailing edge beside the notes, links or polls, and the header switches only the board. The chat keeps its place in the tree, so a fold or a rotation into two panes keeps the draft; a chat at its newest message stays there when its box changes size. Notes stand as a board in columns. - Administration and settings share a section list beside the page (MSectionNav); the stats grid takes four columns. - Collections: the lists stand in a column beside the places, which take two columns, and the head names the list on show. - Journal: the entries become a feed beside the map, under their days, with photo, place and the start of the story, in step with the map like the strip of cards it replaces; it fades out under the header. - The assistant opens as a tall panel at the trailing edge over a dimmed page, as Slide Over would, instead of covering the whole screen. - The rail fits every name: a word too wide for it shrinks the label before it is hyphenated, and the admin entry uses its short name. - The journeys and notifications headers keep to their column. - The address screen of the native shell sets the photo as a panel beside the choices on a large screen on its side. On a foldable that reports its fold, a leading pane ends at the fold and a trailing one starts there. Phones keep their layout.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// FE-COLLAB-CHATDATA-001 to FE-COLLAB-CHATDATA-016: the trip chat logic behind the desktop
|
||||
// FE-COLLAB-CHATDATA-001 to FE-COLLAB-CHATDATA-018: the trip chat logic behind the desktop
|
||||
// Collab panel (quiet older-page errors, scroll on remote delete, upload progress) and the
|
||||
// phone's chat tab (toasted older-page errors, sending gated on the edit permission).
|
||||
import { act, renderHook, waitFor } from '@testing-library/react';
|
||||
@@ -285,3 +285,60 @@ describe('useCollabChatData', () => {
|
||||
expect(toast.error).toHaveBeenCalledWith('common.error');
|
||||
});
|
||||
});
|
||||
|
||||
describe('useCollabChatData on a box that changes size', () => {
|
||||
// The observer reports when the test says the list's box has changed.
|
||||
let report: () => void = () => {};
|
||||
class Observer {
|
||||
constructor(callback: ResizeObserverCallback) {
|
||||
report = () => callback([], this as unknown as ResizeObserver);
|
||||
}
|
||||
observe() {}
|
||||
unobserve() {}
|
||||
disconnect() {}
|
||||
}
|
||||
|
||||
function mountList(scrollHeight: number) {
|
||||
let scrollTop = 0;
|
||||
const list = document.createElement('div');
|
||||
Object.defineProperty(list, 'scrollHeight', { configurable: true, get: () => scrollHeight });
|
||||
Object.defineProperty(list, 'clientHeight', { configurable: true, get: () => 400 });
|
||||
Object.defineProperty(list, 'scrollTop', {
|
||||
configurable: true,
|
||||
get: () => scrollTop,
|
||||
set: (v: number) => {
|
||||
scrollTop = v;
|
||||
},
|
||||
});
|
||||
const hook = renderHook(() => {
|
||||
const chat = useCollabChatData({
|
||||
tripId: 1,
|
||||
t,
|
||||
toast: { success: vi.fn(), error: vi.fn(), warning: vi.fn(), info: vi.fn() },
|
||||
});
|
||||
(chat.scrollRef as { current: HTMLDivElement | null }).current = list;
|
||||
return chat;
|
||||
});
|
||||
return { hook, list, grow: (to: number) => (scrollHeight = to) };
|
||||
}
|
||||
|
||||
afterEach(() => vi.unstubAllGlobals());
|
||||
|
||||
it('FE-COLLAB-CHATDATA-017: a list at its newest message stays there when a rotation or a fold resizes it', () => {
|
||||
vi.stubGlobal('ResizeObserver', Observer);
|
||||
const { list, grow } = mountList(400);
|
||||
grow(900);
|
||||
report();
|
||||
expect(list.scrollTop).toBe(900);
|
||||
});
|
||||
|
||||
it('FE-COLLAB-CHATDATA-018: a list read further up keeps its place', () => {
|
||||
vi.stubGlobal('ResizeObserver', Observer);
|
||||
const { hook, list, grow } = mountList(2000);
|
||||
list.scrollTop = 200;
|
||||
hook.result.current.checkAtBottom();
|
||||
grow(2600);
|
||||
report();
|
||||
expect(list.scrollTop).toBe(200);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -77,6 +77,19 @@ export function useCollabChatData({
|
||||
isAtBottom.current = el.scrollHeight - el.scrollTop - el.clientHeight < 48;
|
||||
}, []);
|
||||
|
||||
// A list that sat at its newest message stays there when its box changes size (a
|
||||
// rotation, a fold, a pane opening beside it): the messages wrap anew and the list
|
||||
// grows, which left the newest ones below the composer.
|
||||
useEffect(() => {
|
||||
const el = scrollRef.current;
|
||||
if (!el || typeof ResizeObserver === 'undefined') return;
|
||||
const observer = new ResizeObserver(() => {
|
||||
if (isAtBottom.current) el.scrollTop = el.scrollHeight;
|
||||
});
|
||||
observer.observe(el);
|
||||
return () => observer.disconnect();
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
setLoading(true);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// FE-JRN-CAROUSEL-001 to FE-JRN-CAROUSEL-009: the card carousel over the journey map,
|
||||
// FE-JRN-CAROUSEL-001 to FE-JRN-CAROUSEL-010: the card carousel over the journey map,
|
||||
// behind both the phone journey screen and the narrow desktop and public timeline.
|
||||
import { act, renderHook } from '@testing-library/react';
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
||||
@@ -184,4 +184,33 @@ describe('useJourneyCarouselSync', () => {
|
||||
settleAt(0);
|
||||
expect(hook.result.current.activeIndex).toBe(0);
|
||||
});
|
||||
|
||||
it('FE-JRN-CAROUSEL-010: a strip that comes back (the feed on a wide window gave way to it) is tracked again', () => {
|
||||
const carousel = document.createElement('div');
|
||||
carousel.getBoundingClientRect = () => ({ left: 0 }) as DOMRect;
|
||||
Object.defineProperty(carousel, 'clientWidth', { value: 500 });
|
||||
let strip: HTMLDivElement | null = null;
|
||||
const hook = renderHook(
|
||||
(p: Options) => {
|
||||
const sync = useJourneyCarouselSync(p);
|
||||
(sync.carouselRef as { current: HTMLDivElement | null }).current = strip;
|
||||
return sync;
|
||||
},
|
||||
{ initialProps: { entries: ENTRIES, mapEntries: [], onOpenEntry: vi.fn(), layoutKey: true } }
|
||||
);
|
||||
ENTRIES.forEach((_, i) => {
|
||||
const node = document.createElement('div');
|
||||
node.getBoundingClientRect = () => ({ left: i * 200, width: 100 }) as DOMRect;
|
||||
hook.result.current.cardRefs.current.set(i, node);
|
||||
});
|
||||
|
||||
// The strip mounts with the layout's turn, with the same entries as before.
|
||||
strip = carousel;
|
||||
hook.rerender({ entries: ENTRIES, mapEntries: [], onOpenEntry: vi.fn(), layoutKey: false });
|
||||
carousel.dispatchEvent(new Event('scroll'));
|
||||
act(() => {
|
||||
vi.advanceTimersByTime(90);
|
||||
});
|
||||
expect(hook.result.current.activeIndex).toBe(1);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { useCallback, useEffect, useMemo, useRef, useState, type RefObject } from 'react';
|
||||
|
||||
import type { JourneyMapHandle } from './JourneyMap';
|
||||
import { journeyDays } from './journeyCard';
|
||||
@@ -17,6 +17,11 @@ export interface JourneyCarouselSyncOptions<E extends CarouselEntry> {
|
||||
onOpenEntry: (entry: E) => void;
|
||||
/** A tap on another card also moves the map to it (the phone screen). */
|
||||
syncMapOnTap?: boolean;
|
||||
/**
|
||||
* Changes whenever the strip comes or goes (the phone screen shows a feed in its
|
||||
* place on a wide window), so its scroll tracking attaches to the strip on show.
|
||||
*/
|
||||
layoutKey?: unknown;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -55,6 +60,56 @@ function nearestCardIndex(el: HTMLDivElement | null, cards: Map<number, HTMLDivE
|
||||
*/
|
||||
const SETTLE_MS = 90;
|
||||
|
||||
interface StripScrollOptions {
|
||||
carouselRef: RefObject<HTMLDivElement | null>;
|
||||
count: number;
|
||||
nearestCard: () => number | null;
|
||||
pickNearestCard: () => void;
|
||||
onLive: (index: number | null) => void;
|
||||
layoutKey: unknown;
|
||||
}
|
||||
|
||||
/**
|
||||
* Follows the strip's scrolling: the card under the centre while it moves, the
|
||||
* active card once it settles. Every state update waits for the strip to come
|
||||
* to rest, because updating the active card mid swipe resizes the cards and
|
||||
* reflows the layout on every frame. Attaches again whenever `layoutKey`
|
||||
* changes, since the strip may only now be on screen.
|
||||
*/
|
||||
function useStripScroll({ carouselRef, count, nearestCard, pickNearestCard, onLive, layoutKey }: StripScrollOptions) {
|
||||
useEffect(() => {
|
||||
const el = carouselRef.current;
|
||||
if (!el || count === 0) return;
|
||||
let settleTimer: number | null = null;
|
||||
let frame: number | null = null;
|
||||
const onScroll = () => {
|
||||
if (frame == null) {
|
||||
frame = window.requestAnimationFrame(() => {
|
||||
frame = null;
|
||||
onLive(nearestCard());
|
||||
});
|
||||
}
|
||||
if (settleTimer != null) window.clearTimeout(settleTimer);
|
||||
settleTimer = window.setTimeout(pickNearestCard, SETTLE_MS);
|
||||
};
|
||||
// Where the browser says when the snap has landed, the card grows right then
|
||||
// instead of a beat later; the timer stays for the ones that do not.
|
||||
const onScrollEnd = () => {
|
||||
if (settleTimer != null) window.clearTimeout(settleTimer);
|
||||
settleTimer = null;
|
||||
pickNearestCard();
|
||||
};
|
||||
el.addEventListener('scroll', onScroll, { passive: true });
|
||||
el.addEventListener('scrollend', onScrollEnd, { passive: true });
|
||||
return () => {
|
||||
el.removeEventListener('scroll', onScroll);
|
||||
el.removeEventListener('scrollend', onScrollEnd);
|
||||
if (settleTimer != null) window.clearTimeout(settleTimer);
|
||||
if (frame != null) window.cancelAnimationFrame(frame);
|
||||
};
|
||||
}, [carouselRef, count, pickNearestCard, nearestCard, onLive, layoutKey]);
|
||||
}
|
||||
|
||||
/**
|
||||
* The card carousel over the journey map, behind both the phone journey screen and the
|
||||
* narrow desktop and public timeline: the active card is the one nearest the centre
|
||||
@@ -66,6 +121,7 @@ export function useJourneyCarouselSync<E extends CarouselEntry>({
|
||||
mapEntries,
|
||||
onOpenEntry,
|
||||
syncMapOnTap = false,
|
||||
layoutKey,
|
||||
}: JourneyCarouselSyncOptions<E>) {
|
||||
const mapRef = useRef<JourneyMapHandle>(null);
|
||||
const carouselRef = useRef<HTMLDivElement>(null);
|
||||
@@ -106,39 +162,7 @@ export function useJourneyCarouselSync<E extends CarouselEntry>({
|
||||
});
|
||||
}, [nearestCard, syncMapToCard]);
|
||||
|
||||
// Defer every state update until scrolling settles: updating the active card
|
||||
// mid swipe resizes the cards and reflows the layout on every frame.
|
||||
useEffect(() => {
|
||||
const el = carouselRef.current;
|
||||
if (!el || entries.length === 0) return;
|
||||
let settleTimer: number | null = null;
|
||||
let frame: number | null = null;
|
||||
const onScroll = () => {
|
||||
if (frame == null) {
|
||||
frame = window.requestAnimationFrame(() => {
|
||||
frame = null;
|
||||
setLiveIndex(nearestCard());
|
||||
});
|
||||
}
|
||||
if (settleTimer != null) window.clearTimeout(settleTimer);
|
||||
settleTimer = window.setTimeout(pickNearestCard, SETTLE_MS);
|
||||
};
|
||||
// Where the browser says when the snap has landed, the card grows right then
|
||||
// instead of a beat later; the timer stays for the ones that do not.
|
||||
const onScrollEnd = () => {
|
||||
if (settleTimer != null) window.clearTimeout(settleTimer);
|
||||
settleTimer = null;
|
||||
pickNearestCard();
|
||||
};
|
||||
el.addEventListener('scroll', onScroll, { passive: true });
|
||||
el.addEventListener('scrollend', onScrollEnd, { passive: true });
|
||||
return () => {
|
||||
el.removeEventListener('scroll', onScroll);
|
||||
el.removeEventListener('scrollend', onScrollEnd);
|
||||
if (settleTimer != null) window.clearTimeout(settleTimer);
|
||||
if (frame != null) window.cancelAnimationFrame(frame);
|
||||
};
|
||||
}, [entries.length, pickNearestCard, nearestCard]);
|
||||
useStripScroll({ carouselRef, count: entries.length, nearestCard, pickNearestCard, onLive: setLiveIndex, layoutKey });
|
||||
|
||||
const scrollCardIntoCenter = useCallback((idx: number) => {
|
||||
cardRefs.current.get(idx)?.scrollIntoView({ behavior: 'smooth', inline: 'center', block: 'nearest' });
|
||||
|
||||
@@ -18,7 +18,7 @@ import { useIsPhone } from '../../mobile/useIsPhone'
|
||||
* category, addressed by name, so a category a user called "all" or "done"
|
||||
* can have its own bucket instead of the built-in one.
|
||||
*/
|
||||
type TodoActiveFilter = { kind: 'smart'; id: TodoSmartFilter } | { kind: 'category'; name: string }
|
||||
export type TodoActiveFilter = { kind: 'smart'; id: TodoSmartFilter } | { kind: 'category'; name: string }
|
||||
|
||||
type TodoSort = 'priority' | 'due' | null
|
||||
|
||||
|
||||
Reference in New Issue
Block a user