fix(nav): the address follows the view through overlays, reloads and Back (review round 1)
- A URL mirror names the view again on every entry Back or Forward lands on, so a change made under a dialog, a drawer or a sub-view is not undone by the next reload. - A view pushed from the entry a reload under a dialog started from no longer inherits its overlay mark; a reload under two overlays closes onto the page in one step. - The linked player reopens over a live search, gives itself up when its list moves first, and plays alone over an emptied playlist; a capped Files list keeps the link it cannot resolve. - The Feed press over a channel ends the search; leaving a search ends its asked mark; Files and Playlists searches end with their page; the feed always names its view and debounces its search. - Search-box keys are declared per module and kept out of the client log below TRACE. - Writers outside lib/ go through codecs; the URL contract scans computed keys, overlay writers and two-line reads, and holds every page to a bookmark round trip (Config, Activity, Playlists and the Files sort and viewer added).
This commit is contained in:
+56
-14
@@ -87,7 +87,10 @@ if (typeof window !== "undefined") {
|
||||
|
||||
/** Call right before a pushState that opens a new view over the current entry (a page, a sub-view, a
|
||||
* channel, a tab). Returns the current state WITHOUT the stamp: a push that spreads the current state
|
||||
* must spread this, so the new entry does not inherit a position it was never left from. */
|
||||
* must spread this, so the new entry does not inherit a position it was never left from — nor an
|
||||
* overlay's marks, which belong to the entry being left (an entry a reload under an open dialog
|
||||
* started from carries them, and the first overlay over a view pushed from it took that view's entry
|
||||
* over for its own). */
|
||||
export function rememberNavPosition(): Record<string, unknown> {
|
||||
// A restore still waiting for the last landing's lists belongs to the page being left: left
|
||||
// running, it would focus "list N, item M" of whatever page this push opens.
|
||||
@@ -95,7 +98,8 @@ export function rememberNavPosition(): Record<string, unknown> {
|
||||
const { sfNav: _stale, ...st } = (window.history.state ?? {}) as Record<string, unknown>;
|
||||
const pos = navPosition();
|
||||
window.history.replaceState(pos ? { ...st, sfNav: pos } : st, "");
|
||||
return st;
|
||||
const { _ov: _overlay, _ovd: _depth, ...view } = st;
|
||||
return view;
|
||||
}
|
||||
|
||||
// --- Is the entry a back() lands on still ours? --------------------------------------------
|
||||
@@ -111,12 +115,12 @@ interface NavigationLike {
|
||||
entries: () => readonly { sameDocument: boolean }[];
|
||||
}
|
||||
|
||||
/** Would one more history.back() still land in this document? */
|
||||
export function backStaysInDocument(): boolean {
|
||||
/** Would `steps` more steps back (one, a history.back()) still land in this document? */
|
||||
export function backStaysInDocument(steps = 1): boolean {
|
||||
const nav = (window as { navigation?: NavigationLike }).navigation;
|
||||
const at = nav?.currentEntry?.index;
|
||||
if (nav == null || at == null) return true;
|
||||
return nav.entries()[at - pendingProgrammatic - 1]?.sameDocument === true;
|
||||
return nav.entries()[at - pendingSteps - steps]?.sameDocument === true;
|
||||
}
|
||||
|
||||
// --- Sub-views (value carried in history.state._sub) ---------------------------------------
|
||||
@@ -292,10 +296,36 @@ const nextOverlayToken = () => ++overlayCounter;
|
||||
let historyDepth = 0;
|
||||
// The entry this document was loaded on, when it was an overlay's (a reload under an open player):
|
||||
// the first overlay to open takes it over rather than pushing another over it — pushed, Back would
|
||||
// close the player onto that same page again, one dead step per reload. Until the first push or Back.
|
||||
// close the player onto that same page again, one dead step per reload. Until the first push or Back;
|
||||
// a view pushed from it does not carry its mark (rememberNavPosition). `_ovd` on an overlay's entry is how many overlay
|
||||
// entries it stood on, its own included: a reload under two (a dialog, or a maximised player, over
|
||||
// the player) leaves the lower one's entry under the one taken over, and closing the taken-over
|
||||
// overlay steps back over those too (`deadBelow`) — one Back closes it, as it opened.
|
||||
let reloadedOverlayEntry: unknown = window.history.state?._ov ?? null;
|
||||
// Programmatic history.back() calls still awaiting their popstate — each must be ignored.
|
||||
const reloadedDepth: unknown = window.history.state?._ovd;
|
||||
let deadBelow = 0;
|
||||
// Programmatic history steps back still awaiting their popstate — each must be ignored — and how
|
||||
// many entries they step over in all (a step over dead entries is one traversal of several).
|
||||
let pendingProgrammatic = 0;
|
||||
let pendingSteps = 0;
|
||||
const pendingStepCounts: number[] = [];
|
||||
function stepBack(steps: number): void {
|
||||
pendingProgrammatic++;
|
||||
pendingSteps += steps;
|
||||
pendingStepCounts.push(steps);
|
||||
if (steps === 1) window.history.back();
|
||||
else window.history.go(-steps);
|
||||
}
|
||||
function landedStepBack(): void {
|
||||
pendingProgrammatic--;
|
||||
pendingSteps -= pendingStepCounts.shift() ?? 1;
|
||||
}
|
||||
// The overlay at the bottom of the stack closing: back over its entry and any dead ones under it.
|
||||
function stepsToClose(): number {
|
||||
const steps = historyDepth === 0 ? 1 + deadBelow : 1;
|
||||
if (historyDepth === 0) deadBelow = 0;
|
||||
return steps;
|
||||
}
|
||||
let reconcileScheduled = false;
|
||||
let listenerInstalled = false;
|
||||
// Re-checked after every reconcile — see `afterClosing`.
|
||||
@@ -314,19 +344,27 @@ function reconcileHistory(): void {
|
||||
const here = window.history.state?._ov;
|
||||
if (historyDepth === 1 && here != null && here === reloadedOverlayEntry) {
|
||||
reloadedOverlayEntry = null;
|
||||
if (typeof reloadedDepth === "number" && reloadedDepth > 1) deadBelow = reloadedDepth - 1;
|
||||
continue;
|
||||
}
|
||||
reloadedOverlayEntry = null;
|
||||
window.history.pushState({ ...window.history.state, _ov: nextOverlayToken() }, "");
|
||||
window.history.pushState(
|
||||
{ ...window.history.state, _ov: nextOverlayToken(), _ovd: historyDepth + deadBelow },
|
||||
"",
|
||||
);
|
||||
}
|
||||
while (historyDepth > want) {
|
||||
historyDepth--;
|
||||
if (backStaysInDocument()) {
|
||||
pendingProgrammatic++;
|
||||
window.history.back();
|
||||
} else {
|
||||
const steps = stepsToClose();
|
||||
if (backStaysInDocument(steps)) stepBack(steps);
|
||||
else if (steps > 1 && backStaysInDocument()) stepBack(1);
|
||||
else {
|
||||
// Nothing of ours below to step back to (see backStaysInDocument): the entry stays, unmarked.
|
||||
const { _ov: _drop, ...st } = (window.history.state ?? {}) as Record<string, unknown>;
|
||||
const {
|
||||
_ov: _drop,
|
||||
_ovd: _depth,
|
||||
...st
|
||||
} = (window.history.state ?? {}) as Record<string, unknown>;
|
||||
window.history.replaceState(st, "");
|
||||
}
|
||||
}
|
||||
@@ -368,7 +406,7 @@ function ensureOverlayListener(): void {
|
||||
window.addEventListener("popstate", () => {
|
||||
reloadedOverlayEntry = null;
|
||||
if (pendingProgrammatic > 0) {
|
||||
pendingProgrammatic--; // our own back(): consume and ignore
|
||||
landedStepBack(); // our own back(): consume and ignore
|
||||
// The last one landed: an overlay that opened while it was in flight still owes its entry.
|
||||
if (pendingProgrammatic === 0 && historyDepth < overlayStack.length) scheduleReconcile();
|
||||
else nameOverlaysHere();
|
||||
@@ -376,7 +414,11 @@ function ensureOverlayListener(): void {
|
||||
}
|
||||
// Genuine user Back: the browser already dropped one overlay entry, so close the topmost
|
||||
// overlay to match. Its unmount cleanup finds itself already off the stack and only re-syncs.
|
||||
// The last one closing over dead entries (see `deadBelow`) steps over them too.
|
||||
if (historyDepth > 0) historyDepth--;
|
||||
const dead = historyDepth === 0 ? deadBelow : 0;
|
||||
if (historyDepth === 0) deadBelow = 0;
|
||||
if (dead > 0 && backStaysInDocument(dead)) stepBack(dead);
|
||||
const top = overlayStack.pop();
|
||||
if (top) top.cb();
|
||||
scheduleReconcile();
|
||||
|
||||
Reference in New Issue
Block a user