staffa 0.12.1 → 0.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,33 +1,36 @@
1
1
  import A, { OPAQUE } from "aberdeen";
2
2
  import * as route from "aberdeen/route";
3
- import { type Slot, drawSlot } from "../core.js";
3
+ import { type Slot, drawSlot, cssZoom, MIN_PX } from "../core.js";
4
4
  import {
5
- circle as dotIcon, externalLink as newTabIcon, link as linkIcon,
6
- pin as pinIcon, pinOff as pinOffIcon, slash as sepIcon, x as closeIcon,
5
+ circle as dotIcon, pin as pinIcon, pinOff as pinOffIcon,
6
+ slash as sepIcon, x as closeIcon,
7
7
  } from "../icons.js";
8
- import { SURFACE_SHEEN } from "../theme.js";
8
+ import { PANEL_SHEEN } from "../theme.js";
9
9
  import { addContextMenu } from "./menu.js";
10
10
  import { scrollStrip, revealInStrip } from "./tabs.js";
11
- import { toast } from "./toast.js";
12
11
 
13
12
  /**
14
13
  * Routed, multi-column panel navigation for {@link main}.
15
14
  *
16
15
  * Each route draws one screen of the app, called a *panel*. The open panels
17
- * form a **stack**, and one of them is the **current** panel: the one the URL
16
+ * form a **stack**, whose last panel is the **current** one: the panel the URL
18
17
  * names, and the rightmost column on screen. As many panels as fit are shown,
19
18
  * ending at the current one — on a phone that is one at a time, on a wider
20
19
  * screen the panels that would have covered each other sit side by side
21
20
  * instead. The app's own code is the same either way.
22
21
  *
23
- * Going to a panel that is already open — a breadcrumb, or any link to it —
24
- * just moves the current-panel cursor along the stack: panels right of it stay
25
- * open, parked past the right edge of the viewport, and nothing closes.
26
- * Opening a *new* panel is what prunes: everything after the panel it came
27
- * from closes, except panels the user pinned — which ride along beneath the
28
- * new panel — and panels holding unsaved work, which no navigation ever tears
29
- * down. Escape steps one panel left, closing the panel it leaves only when
30
- * that panel is the stack's discardable end.
22
+ * Whatever a navigation lands on becomes the top of that stack, and the same
23
+ * path is never in it twice. Opening a new panel closes everything after the
24
+ * panel it came from; a plain link to a panel that is already open — a
25
+ * breadcrumb, a nav item for the section you are in — returns to its own
26
+ * place, closing whatever was stacked on top, while a `replace` or `open`
27
+ * applies its usual shape, the open panel moving into it alive.
28
+ * Two kinds of panel survive that: the ones the user pinned, which ride along,
29
+ * and the ones holding unsaved work, which no navigation ever tears down.
30
+ * Those wait parked out of sight past the rightmost column, which is the only
31
+ * way a panel ever sits *after* the current one. Escape closes the current
32
+ * panel — or just steps left, when it holds unsaved work or panels sit parked
33
+ * beyond it.
31
34
  *
32
35
  * Navigation runs through `aberdeen/route`: the URL holds the current panel,
33
36
  * and the rest of the arrangement — the panels before it, the ones parked
@@ -101,6 +104,15 @@ export type AncestorTable<R> = {
101
104
 
102
105
  // ─── The Panel object ─────────────────────────────────────────────────────────
103
106
 
107
+ /**
108
+ * How wide a panel asks to be — a ceiling the shell never exceeds; see
109
+ * {@link Panel.maxWidth}. `"small"` is the column the content area is divided
110
+ * into; `"medium"` and `"large"` are two and three of those, and `"none"` is
111
+ * the whole area. Each is capped at the content area, so on a narrow window
112
+ * they all come to the same thing.
113
+ */
114
+ export type PanelSize = "small" | "medium" | "large" | "none";
115
+
104
116
  /**
105
117
  * What a route handler gets: the params from its route, plus everything the
106
118
  * shell needs to know about the panel it is drawing. It's an Aberdeen proxy, so
@@ -171,33 +183,35 @@ export interface Panel<P = Record<string, string | number | string[]>> {
171
183
  */
172
184
  readonly visible: boolean;
173
185
  /**
174
- * The widest this panel can usefully be. Every panel must work at 360–540px,
175
- * because that is what it gets when two columns fit; this says how much
176
- * *more* it can take.
186
+ * The widest this panel can usefully be — a ceiling the shell never
187
+ * exceeds, so the draw function never has to look right past it. It is
188
+ * counted in the shell's *columns*: the content area divides into the
189
+ * narrowest whole number of columns of at least 360px each (three columns
190
+ * of 360 in a 1080px area, four of 380 in 1520px), and a column is never
191
+ * wider than 540 — where the area holds just one, a small centres in it
192
+ * rather than stretching. So an ask never exceeds its column count × 540:
177
193
  *
178
- * - `"half"` — nothing more. Half the content area (360–540px), so a second
179
- * column fits beside it. For lists and detail forms.
180
- * - `"full"` (the default) — the whole content area, up to ~1100px.
181
- * - `"screen"` — the whole window, unbounded: boards, wide tables, dense
182
- * dashboards. While one is open the columns stretch to the screen edges
183
- * instead of stopping at the standard 1280px page; the top bar and
184
- * footer hold the standard width throughout.
194
+ * - `"small"` — one column, never above 540px: lists, detail forms.
195
+ * - `"medium"` (the default) — two columns, never above 1080px.
196
+ * - `"large"` — three columns, never above 1620px: wide tables.
197
+ * - `"none"` — the whole content area, unbounded: boards, dashboards.
198
+ * Bound it with the shell's own `maxWidth` where that matters.
185
199
  *
186
- * Below the width two columns need, everything takes the content area
187
- * whatever it asked for. Widths depend only on the window, never on what
188
- * else is open, so opening or closing a panel never resizes another.
200
+ * Every size is capped at the content area, so on a phone they all come to
201
+ * the same thing: one screen at a time. And a width depends only on the
202
+ * window, never on what else is open, so opening or closing a panel never
203
+ * resizes another — the run of columns just recentres in the area.
189
204
  *
190
- * This is a *layout regime*, not a width guarantee: handle whatever width
191
- * the bucket yields, and ask only for what your content can actually use —
192
- * a screen that would cap its own content narrower than its ask is holding
193
- * room that would have let another column fit beside it.
205
+ * Ask only for what your content can actually use: a panel that would cap
206
+ * its own content narrower than its ask is holding room that would have
207
+ * let another column fit beside it.
194
208
  *
195
209
  * Set it at the top of your handler and the panel is already that wide when
196
210
  * you draw (see {@link Panel.width}); set it later — when your data tells you
197
211
  * — and the panel reflows without being redrawn, keeping its state, while
198
212
  * the columns beside it move over.
199
213
  */
200
- maxWidth?: "half" | "full" | "screen";
214
+ maxWidth?: PanelSize;
201
215
  /**
202
216
  * Set this while you're fetching what the panel needs, and back to `false`
203
217
  * when you're done. A new panel waits a moment before sliding in, so it can
@@ -208,10 +222,10 @@ export interface Panel<P = Record<string, string | number | string[]>> {
208
222
  loading?: boolean;
209
223
  /**
210
224
  * Keeps this panel from being closed by navigation happening *elsewhere*.
211
- * Opening a new panel normally closes everything after the panel it came
212
- * from; a pinned panel survives that, staying in the stack — parked past the
213
- * right edge of the viewport — slotted in beneath the new panel, one crumb
214
- * click away. The user toggles it from the crumb's context menu
225
+ * A navigation normally closes everything after the panel it came from (or
226
+ * returned to); a pinned panel survives that, staying in the stack — slotted
227
+ * in beneath the new panel, or parked out of sight when the new panel was
228
+ * already beneath it. Either way it is one crumb click away. The user toggles it from the crumb's context menu
215
229
  * (right-click or long-press), which is also where the pin shows; setting
216
230
  * it from code does the same thing.
217
231
  *
@@ -223,12 +237,11 @@ export interface Panel<P = Record<string, string | number | string[]>> {
223
237
  /**
224
238
  * Set this while the panel holds work that must not be lost — a dirty form,
225
239
  * an upload in flight. An unsaved panel cannot be closed, by anything:
226
- * navigation that would prune it parks it instead, past the viewport's
227
- * right edge, wearing a ● in its crumb — even the browser's back button
228
- * only parks it. {@link Panel.close} and the crumb menu's Close refuse,
240
+ * navigation that would prune it parks it out of sight instead, wearing a
241
+ * ● in its crumb — even the browser's back button only parks it. {@link Panel.close} and the crumb menu's Close refuse,
229
242
  * Escape on it steps left along the stack rather than closing, and closing
230
- * the browser tab runs into the browser's own are-you-sure (after which the
231
- * shell brings the unsaved panel back on screen).
243
+ * the browser tab runs into the browser's own are-you-sure, the unsaved
244
+ * panel brought on screen as the question is raised.
232
245
  *
233
246
  * Only the app clears it; the user has no toggle. A Save or Discard button
234
247
  * clears it and then closes:
@@ -404,10 +417,9 @@ function matchRoute(r: { segs: Seg[] }, segments: string[]): Record<string, any>
404
417
 
405
418
  /**
406
419
  * The one duration every bit of shell motion shares: the enter/exit fades, the
407
- * `left` moves of columns shifting sideways, the ensemble-width transition the
408
- * body row follows (see `--s-shell-w` in main.ts), and the narrow-screen nav
409
- * panel's slide. Published as the `--s-panel-ms` custom property below, so CSS
410
- * and JS can't drift apart.
420
+ * `left` moves of columns shifting sideways, and the narrow-screen nav panel's
421
+ * slide. Published as the `--s-panel-ms` custom property below, so CSS and JS
422
+ * can't drift apart.
411
423
  *
412
424
  * Short enough to read as *the screen responded*, rather than as an animation
413
425
  * being played at you: a panel arriving is navigation, and navigation should
@@ -417,15 +429,14 @@ const PAGE_MS = 250;
417
429
  /** How long a freshly pushed `loading` panel holds its enter animation. */
418
430
  const LOADING_HOLD_MS = 300;
419
431
  /**
420
- * The standard page width: sidebar plus content area, capped by the window.
421
- * `"full"` fills the content-area part of this exactly; only a `"screen"`
422
- * page makes the shell grow past it. The top bar and footer keep to this
423
- * width even then (see main.ts), so the chrome holds still while the
424
- * columns stretch.
432
+ * The bounds of a column. At least 360px — the phone width every panel must
433
+ * handle anyway. And at most 540: that is the width the multi-column regime
434
+ * never reaches (`area / floor(area / 360)` stays under it), so capping the
435
+ * lone column of a 540–720px area to it too — centred, rather than stretched —
436
+ * makes an ask's ceiling uniform: never wider than its column count × 540.
425
437
  */
426
- export const SHELL_PX = 1280;
427
- /** Don't pair smalls when half the content area would be narrower than this. */
428
- const PAIR_MIN_PX = 360;
438
+ const SMALL_MIN_PX = MIN_PX;
439
+ export const SMALL_MAX_PX = 540;
429
440
  /**
430
441
  * Panels are layered by their depth in the stack, two `z-index` steps per panel:
431
442
  * a panel sits on the odd layer for its depth, and a *closing* one drops to the
@@ -445,9 +456,11 @@ A.insertGlobalCss({
445
456
  // layers they stack themselves in (see LAYER_STEP) to themselves: the region
446
457
  // as a whole still sits under the shell's own chrome — the sticky top bar, and
447
458
  // the nav panel that slides across the body — however deep the stack gets.
448
- // The region paints the panel's sheen over its own box, and every panel shows
449
- // a slice of that same gradient (see `.s-panel` below), so the columns and
450
- // the ground beside them are one continuous surface.
459
+ // The region paints the columns' sheen over its own box, and every panel
460
+ // paints the very same one (see `.s-panel` below) — which, being a straight
461
+ // vertical wash over boxes of one height, comes out identical whatever a
462
+ // column's width, so the columns and the ground beside them are one
463
+ // continuous surface.
451
464
  // `overflow:clip`, not `hidden`: a hidden box is still a scroll container,
452
465
  // and anything that ever scrolls it — find-in-page reaching for text in a
453
466
  // parked column, an in-page anchor, an extension — shifts every column
@@ -455,7 +468,7 @@ A.insertGlobalCss({
455
468
  // `clip` clips without being scrollable at all, closing the whole class.
456
469
  ".s-panels":
457
470
  "flex:1 min-width:0 min-height:0 position:relative overflow:clip isolation:isolate " +
458
- SURFACE_SHEEN,
471
+ PANEL_SHEEN,
459
472
  ".s-panel": {
460
473
  // A panel rests at a plain `left` offset and carries no transform: a
461
474
  // transformed element is composited, which costs it subpixel text
@@ -478,18 +491,17 @@ A.insertGlobalCss({
478
491
  //
479
492
  // Every panel paints an opaque ground, because panels animate over one
480
493
  // another — entering, leaving, being crowded out — and two transparent ones
481
- // mean text sliding over text. It takes the panel's own sheen, the one
482
- // `.s-s, body` paints in theme.ts, resolved here against the inherited
483
- // `--s-bg` (a panel is not a surface, so it has to paint it itself).
494
+ // mean text sliding over text. It takes {@link PANEL_SHEEN}, resolved here
495
+ // against the inherited `--s-bg` (a panel is not a surface, so it has to
496
+ // paint it itself).
484
497
  //
485
- // Painted per panel, over the panel's own box, which is as good as it
486
- // needs to be: the sheen is a 9%-either-way wash over a whole column, so
487
- // two columns' worth of it meeting at a hairline is not something the eye
488
- // picks out. The region (`.s-panels` above) paints the same wash, so the
489
- // ground beside a lone column matches it just as closely.
498
+ // Painted per panel, over the panel's own box — and yet seamless with its
499
+ // neighbours and with the ground beside them, because that wash runs
500
+ // straight down: it takes its extent from the height these boxes all share,
501
+ // never from their differing widths. See PANEL_SHEEN for why that matters.
490
502
  "&":
491
503
  "position:absolute top:0 bottom:0 left:0 display:flex flex-direction:column " +
492
- SURFACE_SHEEN + " " +
504
+ PANEL_SHEEN + " " +
493
505
  "visibility:visible transition: left var(--s-panel-ms) ease, transform var(--s-panel-ms) ease-out, opacity var(--s-panel-ms) linear, visibility 0s;",
494
506
  // The hairline between two columns, fading out at both ends — the same
495
507
  // treatment as the sidebar's `.s-nav-sep`. Columns tile the area with no
@@ -663,39 +675,34 @@ interface PanelEntry {
663
675
  /** Whether its `loading` hold has already expired, so it can't hold again. */
664
676
  holdDone?: boolean;
665
677
  /** What the panel asks for, kept in step with its `$panel.maxWidth`. */
666
- maxWidth: "half" | "full" | "screen";
678
+ maxWidth: PanelSize;
667
679
  /**
668
680
  * The width it was last laid out at. Set before the panel's content is first
669
681
  * drawn, so that content has a real box to measure itself against. Visible
670
- * panels get a fresh value every pass (widths are a pure function of the
671
- * content area and small-pairing); hidden and closing panels keep this, so
672
- * nothing invisible ever reflows.
682
+ * panels get a fresh value every pass (a width is a pure function of the
683
+ * content area); hidden and closing panels keep this, so nothing invisible
684
+ * ever reflows.
673
685
  */
674
686
  width: number;
675
687
  }
676
688
 
677
689
  /**
678
690
  * What the shell measures out to, and with it the width every panel size gets.
679
- * A pure function of the window, so it is the same for every panel in a pass.
691
+ * A pure function of the content area, so it is the same for every panel in a
692
+ * pass — and a panel never resizes because a neighbour came or went.
680
693
  */
681
694
  interface Geometry {
682
- /** The body row: everything the columns and the sidebar share. */
683
- total: number;
684
- /** What sits beside the columns — the sidebar and its hairline, if shown. */
685
- chrome: number;
686
- /** Half the standard content area, or all of it when a half would be too narrow. */
687
- half: number;
688
- /** The standard content area: the 1280px page minus the chrome. */
689
- full: number;
690
- /** Everything the window has beside the chrome, with no upper limit. */
691
- screen: number;
695
+ /** The content area: all the room the columns have between them. */
696
+ area: number;
697
+ /** What each {@link PanelSize} comes to in that area. */
698
+ size: Record<PanelSize, number>;
692
699
  }
693
700
 
694
701
  /**
695
702
  * One state of the stack: the open paths, oldest first, and which of them is
696
703
  * the current panel. The panels before `focus` sit (or are crowded out) to the
697
- * current panel's left; the ones after it are parked past the right edge of the
698
- * viewport. What a history entry describes, and what every navigation is
704
+ * current panel's left; the ones after it are parked out of sight — panels
705
+ * that refused to be closed, which is the only way anything ends up there. What a history entry describes, and what every navigation is
699
706
  * expressed as a change to.
700
707
  */
701
708
  interface Arrangement {
@@ -778,10 +785,10 @@ export interface PanelStack {
778
785
  * the new panel).
779
786
  *
780
787
  * The same rules as a link click apply: pushing a path that is already open
781
- * goes back to it — a focus move along the stack, closing nothing — rather
782
- * than opening it twice, and a panel holding {@link Panel.unsaved} work is
783
- * never closed, only parked. That's what a plain link does, and what
784
- * `data-panel=push` says outright.
788
+ * returns to it — closing whatever was stacked on top — rather than opening
789
+ * it twice, and a panel holding {@link Panel.unsaved} work is never closed,
790
+ * only parked. That's what a plain link does, and what `data-panel=push`
791
+ * says outright.
785
792
  *
786
793
  * Note that a link builds on the panel it is *drawn in*, which is the
787
794
  * current panel only while no column beside it has the focus. Code
@@ -884,8 +891,8 @@ export class PanelStackController implements PanelStack {
884
891
  private containerEl?: HTMLElement;
885
892
  /** The shell's measurements, shared by everything drawn since they were taken. */
886
893
  private geom?: Geometry;
887
- /** The body width at the last layout; a change means a window resize → snap. */
888
- private lastBodyW = -1;
894
+ /** The measurements the last layout ran on; a change in them → snap. */
895
+ private lastGeom?: Geometry;
889
896
  private layoutQueued = false;
890
897
  private timers = new Set<ReturnType<typeof setTimeout>>();
891
898
  /** The arrangement the navigation in flight is heading for; see {@link intended}. */
@@ -1162,7 +1169,7 @@ export class PanelStackController implements PanelStack {
1162
1169
  path,
1163
1170
  draw,
1164
1171
  $ui: A.proxy({ holding: false }),
1165
- maxWidth: "full" as const,
1172
+ maxWidth: "medium" as const,
1166
1173
  width: 0,
1167
1174
  } as PanelEntry;
1168
1175
  // `close` closes *this* panel, current or not, and `open` navigates
@@ -1308,31 +1315,32 @@ export class PanelStackController implements PanelStack {
1308
1315
  }
1309
1316
 
1310
1317
  /**
1311
- * Make the stack's `index`th panel current: the URL and the visible run move
1312
- * to it, while the panels right of it stay open, parked past the right edge
1313
- * of the viewport. Nothing closes; it is a history entry, so the browser's
1314
- * back button returns the focus to where it was. What a click on a
1315
- * breadcrumb — any link to an open panel — comes down to.
1318
+ * Make the stack's `index`th panel current without closing anything, leaving
1319
+ * the panels right of it parked out of sight.
1320
+ *
1321
+ * Only ever a step around a panel that refuses to close — nothing else is
1322
+ * left sitting after the current one — so this is Escape's way past an
1323
+ * unsaved panel, and the way back to one. It is a history entry, so the
1324
+ * browser's back button returns the focus to where it was.
1316
1325
  */
1317
- private focusAt(index: number, search?: Record<string, string>, hash?: string): Promise<boolean> {
1326
+ private focusAt(index: number): Promise<boolean> {
1318
1327
  const arr = this.intended();
1319
1328
  if (index < 0 || index >= arr.stack.length || index === arr.focus) return Promise.resolve(false);
1320
1329
  const target = { stack: arr.stack, focus: index };
1321
1330
  const path = arr.stack[index];
1322
1331
  return this.issue(target, () => {
1323
- // The panel gets its own last search and hash back, unless the link
1324
- // that brought us here carries its own.
1332
+ // The panel gets its own last search and hash back (see PanelEntry.search).
1325
1333
  const entry = this.$state.live.find((e) => e.path === path);
1326
- return route.go({ path, search: search ?? entry?.search, hash: hash ?? entry?.hash, state: this.stateFor(target) });
1334
+ return route.go({ path, search: entry?.search, hash: entry?.hash, state: this.stateFor(target) });
1327
1335
  });
1328
1336
  }
1329
1337
 
1330
1338
  /**
1331
1339
  * One step back along the stack — what Escape does (`main()` calls this;
1332
- * it is not {@link PanelStack} API). At the stack's end this closes the
1333
- * current panel; mid-stack — with panels parked to the right — or when the
1334
- * panel holds {@link Panel.unsaved} work, the panel stays open and the
1335
- * focus just moves to the panel on its left, parking the one it leaves.
1340
+ * it is not {@link PanelStack} API). Normally that closes the current panel,
1341
+ * which is the stack's end. When it holds {@link Panel.unsaved} work — or
1342
+ * panels sit parked beyond it — it stays open instead, and the focus
1343
+ * simply moves to the panel on its left.
1336
1344
  * Resolves `false` at the stack's start, where there is no left to go.
1337
1345
  */
1338
1346
  back(): Promise<boolean> {
@@ -1428,11 +1436,14 @@ export class PanelStackController implements PanelStack {
1428
1436
  * that know it.
1429
1437
  *
1430
1438
  * `how` is the link's `data-panel` attribute (or the caller's word for
1431
- * it): absent — like a link without the attribute — it is the shell's
1432
- * `linkNavigation` default, an unrecognised value is a push on top of
1433
- * `from`, `"replace"` swaps `from` out rather than stacking on it, and
1434
- * `"open"` drops `from` altogether so the target arrives with its own
1435
- * stack, the way a nav item's link does.
1439
+ * it), picking how much of `from`'s context the target keeps: a push (the
1440
+ * default, and what unrecognised values fall back to) keeps `from` and
1441
+ * builds on it, `"replace"` keeps only what is beneath `from`, and
1442
+ * `"open"` keeps nothing — the target arrives with its own stack, the way
1443
+ * a nav item's link does. Absent, it is the shell's `linkNavigation`
1444
+ * default, like a link without the attribute. A target that is already
1445
+ * open is returned to by a push, and *moved* — alive, state intact — by
1446
+ * the other two: the stack never holds a path twice.
1436
1447
  *
1437
1448
  * Resolves the way every {@link PanelStack} method does: `true` once the
1438
1449
  * navigation lands, `false` when it doesn't (already there counts as
@@ -1446,48 +1457,61 @@ export class PanelStackController implements PanelStack {
1446
1457
  let url: URL;
1447
1458
  try { url = new URL(href, location.href); } catch { return Promise.resolve(false); }
1448
1459
  const path = normalizePath(url.pathname);
1449
- const search = Object.fromEntries(new URLSearchParams(url.search));
1450
- const hash = url.hash;
1451
1460
  const arr = this.intended();
1452
1461
 
1453
- // A link to a panel that is already open is a return, not a navigation —
1454
- // a stack never holds the same path twice. Returning just moves the
1455
- // focus: the panels right of the target stay open, parked past the right
1456
- // edge, and nothing closes. That is the whole behaviour of a breadcrumb,
1457
- // which is exactly such a link.
1462
+ // Whatever we navigate to ends up on top of the stack; all that differs
1463
+ // is what it lands on.
1458
1464
  const open = beneath ? -1 : arr.stack.indexOf(path);
1459
- if (open >= 0 && open !== arr.focus) {
1460
- return this.focusAt(open, url.search ? search : undefined, hash || undefined);
1461
- }
1462
- if (open >= 0) {
1463
- // The target is the panel we're already on. Going nowhere — but the link
1464
- // may still carry a different search or hash, which belong to the
1465
- // current panel: record that as a history entry, leaving the stack alone
1466
- // (the panel reconciles by path, so it isn't even redrawn).
1467
- if (url.search === location.search && (url.hash || "") === (location.hash || "")) return Promise.resolve(true);
1468
- return this.issue(arr, () => route.go({ path, search, hash, state: this.stateFor(arr) }));
1465
+ let target: Arrangement;
1466
+ if (open >= 0 && mode !== "replace" && mode !== "open") {
1467
+ // A push to a path that is already open is a return: the panel takes
1468
+ // back its own place, and whatever was stacked on top of it closes.
1469
+ // (A stack never holds the same path twice, so there is no second
1470
+ // copy to open — and a breadcrumb is exactly such a link.) Pinned
1471
+ // panels above it are the exception, as ever: they stay in their
1472
+ // order, parked past the panel we return to, one crumb click away.
1473
+ const above = this.pinnedIn(arr.stack.slice(open + 1), []);
1474
+ target = { stack: [...arr.stack.slice(0, open + 1), ...above], focus: open };
1475
+ } else {
1476
+ // The target opens on top of the panel the link sits in, or in its
1477
+ // place for a `replace`, closing the panels after it. Without an
1478
+ // originating panel there is no stack to build on, so it is the
1479
+ // caller's own `beneath` or one derived from the path — which is what
1480
+ // makes a nav click and a deep link to the same URL land identically
1481
+ // (bar the pins, which a fresh tab doesn't have).
1482
+ const originIndex = origin == null ? -1 : arr.stack.indexOf(origin);
1483
+ const raw = beneath
1484
+ ? beneath.map(normalizePath)
1485
+ : originIndex < 0
1486
+ ? this.deriveStack(path).slice(0, -1)
1487
+ : arr.stack.slice(0, replace ? originIndex : originIndex + 1);
1488
+ // A stack never holds the same path twice (rendering reconciles by
1489
+ // path), so the target is dropped from the base — a `replace` or
1490
+ // `open` may well aim at a path that is open mid-stack, whose panel
1491
+ // then simply *moves* to the top, alive — and a caller-supplied
1492
+ // `beneath` is deduplicated for the same reason.
1493
+ const base = raw.filter((p, i, all) => p !== path && all.indexOf(p) === i);
1494
+ // Pinned panels ride along, keeping their order, beneath the new one
1495
+ // (unsaved ones the commit itself keeps, parked — see `propose`). A
1496
+ // replaced origin closes, pin or no pin: replacing is the panel's own
1497
+ // doing, not somewhere else navigating over it.
1498
+ const under = [...base, ...this.pinnedIn(arr.stack, [...base, path, replace ? origin : null])];
1499
+ target = { stack: [...under, path], focus: under.length };
1469
1500
  }
1470
1501
 
1471
- // A new panel: it opens at the stack's end and becomes current. The
1472
- // panels after the origin close — except pinned ones, which ride along,
1473
- // keeping their order, beneath the new panel (and unsaved ones, which
1474
- // the commit itself keeps, parked — see `propose`). Without an
1475
- // originating panel there is no stack to build on, so derive one — a
1476
- // nav click and a deep link to the same URL land identically (bar the
1477
- // pins, which a fresh tab doesn't have).
1478
- const originIndex = origin == null ? -1 : arr.stack.indexOf(origin);
1479
- // A stack never holds the same path twice (rendering reconciles by
1480
- // path), so a caller-supplied `beneath` is deduplicated, not just
1481
- // filtered against the target.
1482
- const base = beneath
1483
- ? beneath.map(normalizePath).filter((p, i, all) => p !== path && all.indexOf(p) === i)
1484
- : originIndex < 0
1485
- ? this.deriveStack(path).slice(0, -1)
1486
- : arr.stack.slice(0, replace ? originIndex : originIndex + 1);
1487
- // A replaced origin closes, pin or no pin: replacing is the panel's own
1488
- // doing, not somewhere else navigating over it.
1489
- const under = [...base, ...this.pinnedIn(arr.stack, [...base, path, replace ? origin : null])];
1490
- const target = { stack: [...under, path], focus: under.length };
1502
+ // Search and hash belong to the current panel only, so a panel we return
1503
+ // to gets its own back (see PanelEntry.search) — unless the link carries
1504
+ // its own, which win.
1505
+ const returning = open >= 0 ? this.$state.live.find((e) => e.path === path) : undefined;
1506
+ const search = url.search ? Object.fromEntries(new URLSearchParams(url.search)) : returning?.search ?? {};
1507
+ const hash = url.hash || returning?.hash || "";
1508
+
1509
+ // Going nowhere at all: this panel, on this arrangement, with the query
1510
+ // the link asks for. Not even a history entry.
1511
+ if (target.focus === arr.focus && sameStack(target.stack, arr.stack)
1512
+ && url.search === location.search && (url.hash || "") === (location.hash || "")) {
1513
+ return Promise.resolve(true);
1514
+ }
1491
1515
  return this.issue(target, () => route.go({ path, search, hash, state: this.stateFor(target) }));
1492
1516
  });
1493
1517
  }
@@ -1574,7 +1598,9 @@ export class PanelStackController implements PanelStack {
1574
1598
  // app that reads them off a proxy (or through a getter) can change them at
1575
1599
  // runtime and the shell adapts in place — nothing is redrawn, no panel
1576
1600
  // loses its state. Not {@link PanelStack} API: the app talks to `main()`'s
1577
- // options; these are how `main()` talks to the stack.
1601
+ // options; these are how `main()` talks to the stack. The shell's *widths*
1602
+ // need no counterpart here: `navWidth` and `maxWidth` both resize the
1603
+ // column region, which the layout engine is already observing.
1578
1604
 
1579
1605
  /** Adopt a changed `columns` setting: one layout pass, nothing redrawn. */
1580
1606
  setColumns(columns: "auto" | "single" | undefined): void {
@@ -1592,11 +1618,11 @@ export class PanelStackController implements PanelStack {
1592
1618
  * The breadcrumb stack, drawn by `main()` into the top bar: every open
1593
1619
  * panel, oldest first, the ones on screen right now in bold, pinned ones
1594
1620
  * wearing their pin. Every crumb but the current panel's is a plain link to
1595
- * that panel, and a link to an open panel is a focus move (see `navigate`) —
1596
- * so clicking along the stack closes nothing, in either direction, and the
1597
- * panels right of the current one wait just past the viewport's edge.
1598
- * Right-click (or long-press) offers pinning, and closing just that one
1599
- * panel — the close that splices it out of the middle when it isn't last.
1621
+ * that panel, and a link to an open panel returns to it (see `navigate`) —
1622
+ * so clicking a crumb goes back to that panel and closes what was stacked on
1623
+ * top of it, pinned and unsaved panels excepted. Right-click (or long-press)
1624
+ * offers pinning, and closing just that one panel — the close that splices
1625
+ * it out of the middle when it isn't last.
1600
1626
  */
1601
1627
  drawCrumbs(): void {
1602
1628
  // The very same row `S.tabs` puts its tab strip in: it scrolls when the
@@ -1641,24 +1667,9 @@ export class PanelStackController implements PanelStack {
1641
1667
  A(() => { if (entry?.$panel.pinned) pinIcon({ size: "0.85em", attrs: ".s-crumb-pin" }); });
1642
1668
  // `||`, not `??`: the root path's last segment is the empty string.
1643
1669
  A(() => { A("#", entry?.$panel.title ?? entry?.$ui.fallback ?? (path.split("/").pop() || path)); });
1644
- // Taking over right-click means taking the browser's link menu away, so
1645
- // the two entries anyone actually reaches for on a link come first,
1646
- // where that menu would have had them, and the shell's own verbs sit
1647
- // below the rule.
1648
- addContextMenu({ items: [
1649
- {
1650
- // A real new tab, so it arrives cold and builds its own stack
1651
- // from the path — exactly what the same link middle-clicked does.
1652
- label: "Open in new tab",
1653
- icon: newTabIcon,
1654
- click: () => { window.open(path, "_blank", "noopener"); },
1655
- },
1656
- {
1657
- label: "Copy link",
1658
- icon: linkIcon,
1659
- click: () => void copyLink(path),
1660
- },
1661
- { separator: true },
1670
+ // `link` puts the browser's own link entries — Open in new tab, Copy
1671
+ // link — above the rule; the shell's own verbs sit below it.
1672
+ addContextMenu({ link: path, items: [
1662
1673
  {
1663
1674
  label: () => { A(() => { A("#", entry?.$panel.pinned ? "Unpin" : "Pin"); }); },
1664
1675
  icon: () => { A(() => { (entry?.$panel.pinned ? pinOffIcon : pinIcon)(); }); },
@@ -1713,29 +1724,24 @@ export class PanelStackController implements PanelStack {
1713
1724
 
1714
1725
  /**
1715
1726
  * While any open panel holds unsaved work, closing the tab — or navigating
1716
- * the whole browser away — runs into the browser's own are-you-sure. When
1717
- * the user stays, the unsaved panel is brought back on screen if it wasn't,
1718
- * so what held the tab is in front of them rather than parked out of sight.
1727
+ * the whole browser away — runs into the browser's own are-you-sure, with
1728
+ * the unsaved panel brought on screen as the question is raised, so what is
1729
+ * holding the tab is in front of the user rather than parked out of sight.
1719
1730
  */
1720
1731
  private guardTabClose(): void {
1721
1732
  if (typeof window === "undefined") return;
1722
- let leaving = false;
1723
- const onHide = () => { leaving = true; };
1724
1733
  const onBeforeUnload = (e: BeforeUnloadEvent) => {
1725
- // Being asked again means we weren't gone after all (a bfcache restore).
1726
- leaving = false;
1727
1734
  const dirty = this.$state.live.find((entry) => entry.$panel.unsaved);
1728
1735
  if (!dirty) return;
1729
1736
  e.preventDefault();
1730
1737
  e.returnValue = true; // Chrome/Edge < 119
1731
- // This task only ever amounts to anything if the user cancels: a
1732
- // confirmed leave unloads the document (`pagehide`) first.
1733
- const path = dirty.path;
1734
- setTimeout(() => {
1735
- if (leaving) return;
1736
- const entry = this.$state.live.find((live) => live.path === path);
1737
- if (entry && !entry.$panel.visible) void this.focusAt(this.intended().stack.indexOf(path));
1738
- }, 0);
1738
+ // Bring the unsaved panel on screen right here, so what is holding the
1739
+ // tab is in front of the user — behind the browser's dialog where the
1740
+ // browser paints that early, and the moment they choose to stay
1741
+ // otherwise. A confirmed leave unloads the document before any of it
1742
+ // is seen; the history entry the move makes is then where a back
1743
+ // navigation returns to, which is right: the panel that held the tab.
1744
+ if (!dirty.$panel.visible) void this.focusAt(this.intended().stack.indexOf(dirty.path));
1739
1745
  };
1740
1746
  // Registered only while a panel actually holds unsaved work: a page with a
1741
1747
  // `beforeunload` listener is shut out of the browser's back/forward cache,
@@ -1744,11 +1750,7 @@ export class PanelStackController implements PanelStack {
1744
1750
  A(() => {
1745
1751
  if (!this.$state.live.some((entry) => entry.$panel.unsaved)) return;
1746
1752
  window.addEventListener("beforeunload", onBeforeUnload);
1747
- window.addEventListener("pagehide", onHide);
1748
- A.clean(() => {
1749
- window.removeEventListener("beforeunload", onBeforeUnload);
1750
- window.removeEventListener("pagehide", onHide);
1751
- });
1753
+ A.clean(() => window.removeEventListener("beforeunload", onBeforeUnload));
1752
1754
  });
1753
1755
  }
1754
1756
 
@@ -1779,12 +1781,11 @@ export class PanelStackController implements PanelStack {
1779
1781
  }) as HTMLElement;
1780
1782
 
1781
1783
  if (typeof ResizeObserver !== "undefined") {
1784
+ // The region *is* the content area every width is measured from (see
1785
+ // `measure`), so watching it catches the lot: a window resize, the
1786
+ // sidebar coming or going, the shell's own `maxWidth` changing.
1782
1787
  const ro = new ResizeObserver(() => this.layout());
1783
- // The region *and* the body it sits in: the region alone misses a shell
1784
- // resize that the columns happen to absorb, which still re-resolves widths.
1785
1788
  ro.observe(container);
1786
- const body = container.parentElement?.parentElement;
1787
- if (body) ro.observe(body);
1788
1789
  A.clean(() => ro.disconnect());
1789
1790
  }
1790
1791
  A.clean(() => { if (this.containerEl === container) this.containerEl = undefined; });
@@ -1798,13 +1799,13 @@ export class PanelStackController implements PanelStack {
1798
1799
  // element that arrives without a width has no box for its content to measure
1799
1800
  // itself against until the next frame's layout pass, which is a frame too
1800
1801
  // late for anything that sizes itself from its container. So the panel is
1801
- // created at the width the window gives it — the "full" width until the panel
1802
- // says otherwise. Reactively, too: a panel that changes its mind later (when
1803
- // its data arrives, say) reflows in place rather than being redrawn, and the
1804
- // columns beside it slide over to make room.
1802
+ // created at the width the window gives it — the "medium" width until the
1803
+ // panel says otherwise. Reactively, too: a panel that changes its mind later
1804
+ // (when its data arrives, say) reflows in place rather than being redrawn,
1805
+ // and the columns beside it slide over to make room.
1805
1806
  A(() => {
1806
1807
  const asked = entry.$panel.maxWidth;
1807
- entry.maxWidth = asked === "half" || asked === "screen" ? asked : "full";
1808
+ entry.maxWidth = asked === "small" || asked === "large" || asked === "none" ? asked : "medium";
1808
1809
  const width = this.roomFor(entry.maxWidth);
1809
1810
  if (!width) return;
1810
1811
  entry.width = width;
@@ -1890,49 +1891,38 @@ export class PanelStackController implements PanelStack {
1890
1891
  }
1891
1892
 
1892
1893
  /**
1893
- * Measure the shell, and with it the width the window gives a panel of each
1894
- * layout. Measured on the *shell*, not on the column region: the region's width
1895
- * is the layout engine's own output, so reading it back would nail the layout
1896
- * to whatever it happened to be a frame ago. Fractional widths throughout — a
1897
- * rounded column edge would drift a pixel away from the chrome above it.
1894
+ * Measure the content area, and with it the width a panel of each size gets.
1895
+ *
1896
+ * The column region *is* the content area: it takes whatever the shell has
1897
+ * left beside the sidebar, capped by the shell's own `maxWidth` — all of it
1898
+ * CSS's doing, so there is nothing to add up here and nothing that could
1899
+ * drift from the width the bars above and below line up with. Fractional
1900
+ * widths throughout: a rounded column edge would drift a pixel away from that
1901
+ * chrome.
1902
+ *
1903
+ * The area divides into the narrowest whole number of columns that keeps each
1904
+ * at least {@link SMALL_MIN_PX} wide — the `"small"` unit every other size is
1905
+ * a multiple of, capped at the area itself. So 1080px is three columns of 360
1906
+ * and 1520px four of 380. An area too narrow for two is a single column,
1907
+ * itself capped at {@link SMALL_MAX_PX}: a small centres there instead of
1908
+ * stretching toward 720, so its ceiling holds, while the larger sizes still
1909
+ * take the whole area. A width is thus a pure function of the window: a panel
1910
+ * NEVER resizes because a neighbour came or went, and only a window resize
1911
+ * (the snap pass in `layout`) changes one.
1898
1912
  *
1899
1913
  * `undefined` while the shell has no width to speak of (it isn't in a document
1900
1914
  * yet, or it's `display:none`); the next pass tries again.
1901
1915
  */
1902
1916
  private measure(): Geometry | undefined {
1903
- const container = this.containerEl;
1904
- const inner = container?.parentElement;
1905
- const body = inner?.parentElement;
1906
- if (!container || !inner || !body) return undefined;
1907
- const total = body.getBoundingClientRect().width;
1908
- if (!total) return undefined;
1909
-
1910
- // Everything that sits beside the columns: the sidebar and its hairline,
1911
- // either of which may be display:none on a narrow shell.
1912
- let chrome = 0;
1913
- for (const child of inner.children) {
1914
- if (child !== container) chrome += child.getBoundingClientRect().width;
1915
- }
1916
-
1917
- // The standard panel is SHELL_PX wide, capped by the window; what it leaves
1918
- // beside the sidebar is the *standard* content area. Widths are a pure
1919
- // function of the window — never of what else is open — so a panel NEVER
1920
- // resizes because a neighbour came or went; only a window resize (the
1921
- // snap pass in `layout`) changes them:
1922
- // - "full" fills the standard content area exactly;
1923
- // - "half" is half of it whenever that half is still a usable column, and
1924
- // the whole of it on narrower screens;
1925
- // - "screen" ignores the standard width and takes everything the window
1926
- // has — which also means nothing ever fits beside it.
1927
- const full = Math.max(0, Math.min(SHELL_PX, total) - chrome);
1928
- const halved = full / 2;
1929
- return {
1930
- total,
1931
- chrome,
1932
- half: halved >= PAIR_MIN_PX ? halved : full,
1933
- full,
1934
- screen: Math.max(0, total - chrome),
1935
- };
1917
+ const el = this.containerEl;
1918
+ // The rect is in window coordinates; the widths this yields are written
1919
+ // back as CSS lengths, which live in the region's own space — different
1920
+ // spaces when the shell has zoomed the page (see `watchScale` in main.ts).
1921
+ const area = el ? el.getBoundingClientRect().width / cssZoom(el) : 0;
1922
+ if (!area) return undefined;
1923
+ const small = Math.min(area / Math.max(1, Math.floor(area / SMALL_MIN_PX)), SMALL_MAX_PX);
1924
+ const units = (n: number) => Math.min(n * small, area);
1925
+ return { area, size: { small, medium: units(2), large: units(3), none: area } };
1936
1926
  }
1937
1927
 
1938
1928
  /**
@@ -1946,13 +1936,12 @@ export class PanelStackController implements PanelStack {
1946
1936
  }
1947
1937
 
1948
1938
  /** How wide a panel asking for this is, right now; 0 while the shell can't be measured. */
1949
- private roomFor(maxWidth: PanelEntry["maxWidth"]): number {
1950
- return this.geometry()?.[maxWidth] ?? 0;
1939
+ private roomFor(size: PanelSize): number {
1940
+ return this.geometry()?.size[size] ?? 0;
1951
1941
  }
1952
1942
 
1953
1943
  /**
1954
- * Size and position every panel, and publish the width of the whole ensemble
1955
- * (sidebar + separator + columns) for the shell to centre itself on.
1944
+ * Size and position every panel.
1956
1945
  *
1957
1946
  * This is everything CSS can't work out for itself: which panels exist, which
1958
1947
  * of them are visible, how wide each one is and where it sits. All the motion
@@ -1977,19 +1966,21 @@ export class PanelStackController implements PanelStack {
1977
1966
  const geom = this.geometry();
1978
1967
  if (!geom) return;
1979
1968
 
1980
- const stacking = this.opts.columns !== "single";
1969
+ const single = this.opts.columns === "single";
1981
1970
 
1982
- // A window resize (or the very first pass) must be adopted instantly —
1983
- // geometry tracking the window through a 450ms transition reads as lag,
1984
- // and a shell animating itself into place on load reads as a glitch.
1971
+ // A window resize — or the app resizing the shell itself, by changing
1972
+ // `navWidth` or `maxWidth` — must be adopted instantly: geometry tracking
1973
+ // the window through a 450ms transition reads as lag, and a shell
1974
+ // animating itself into place on its first pass reads as a glitch. Only
1975
+ // what a *panel* did is worth animating, and none of those three are.
1985
1976
  // `.s-shell-snap` suppresses every standing transition for this one pass.
1986
- const snap = this.lastBodyW !== geom.total;
1977
+ const snap = this.lastGeom?.area !== geom.area;
1987
1978
  if (snap) {
1988
- this.lastBodyW = geom.total;
1979
+ this.lastGeom = geom;
1989
1980
  shell.classList.add("s-shell-snap");
1990
1981
  }
1991
1982
 
1992
- const width = (entry: PanelEntry) => geom[entry.maxWidth];
1983
+ const width = (entry: PanelEntry) => geom.size[entry.maxWidth];
1993
1984
 
1994
1985
  // The visible run: as many columns as the window fits, at the sizes the
1995
1986
  // window gives them, ending at the current panel — which always shows.
@@ -1997,22 +1988,20 @@ export class PanelStackController implements PanelStack {
1997
1988
  const cur = Math.min(this.$state.focus, n - 1);
1998
1989
  let first = cur;
1999
1990
  let runSum = width(live[cur]);
2000
- if (stacking) {
1991
+ if (!single) {
2001
1992
  for (let i = cur - 1; i >= 0; i--) {
2002
1993
  const sum = runSum + width(live[i]);
2003
- if (sum > geom.screen) break;
1994
+ if (sum > geom.area) break;
2004
1995
  runSum = sum;
2005
1996
  first = i;
2006
1997
  }
2007
1998
  }
2008
1999
 
2009
- // The content area holds the run, but is never smaller than the standard
2010
- // panel (a lone small leaves its other half open — which is exactly where
2011
- // the next small lands, without anything on screen moving) and never
2012
- // wider than the window. So the panel is the familiar 1280px until extra
2013
- // columns genuinely fit, and stretches — centred — to hold the ones that
2014
- // do; with a "screen" up that's the window's edges.
2015
- const area = Math.min(geom.screen, Math.max(geom.full, runSum));
2000
+ // The content area is a fixed width, so a run that doesn't fill it sits
2001
+ // centred in it rather than hanging off its left edge. Everything around
2002
+ // the columns holds still meanwhile: the sidebar, the top bar and the
2003
+ // footer never move, however many columns come and go.
2004
+ const left = (geom.area - runSum) / 2;
2016
2005
 
2017
2006
  for (let i = first; i <= cur; i++) live[i].width = width(live[i]);
2018
2007
  // Panels that have never been visible get their would-be width too, so a
@@ -2021,29 +2010,22 @@ export class PanelStackController implements PanelStack {
2021
2010
  if (!entry.width) entry.width = width(entry);
2022
2011
  }
2023
2012
 
2024
- // The body row caps itself to the ensemble width, keeping the columns
2025
- // centred however far the area stretches, and transitions its max-width
2026
- // (see main.ts) so the recentring plays along with the panel that caused
2027
- // it. The bars above and below don't follow — they hold at the standard
2028
- // page width (also main.ts).
2029
- shell.style.setProperty("--s-shell-w", `${geom.chrome + area}px`);
2030
-
2031
2013
  // Phase 1 — every panel's *start* state for this frame. Panels already on
2032
2014
  // screen simply move (their standing transition animates it); freshly
2033
2015
  // mounted ones still have transitions switched off, so what we set here is
2034
2016
  // adopted instantly and becomes the "before" of their enter animation.
2035
2017
  const fresh: PanelEntry[] = [];
2036
- let x = 0;
2018
+ let x = left;
2037
2019
  for (let i = 0; i < n; i++) {
2038
2020
  const entry = live[i];
2039
2021
  const el = entry.el!;
2040
2022
  const shown = i >= first && i <= cur;
2041
- // Visible columns tile the content area, left to right. Panels crowded
2042
- // out from under the run rest at its left edge; panels beyond the
2043
- // current panel park just past its right edge — both keep their last
2044
- // width. Deeper panels layer over shallower ones, each on the odd
2045
- // layer for its depth (see LAYER_STEP).
2046
- place(el, shown ? x : i > cur ? area : 0, entry.width, LAYER_STEP * i + 1);
2023
+ // Visible columns tile the run, left to right. Panels crowded out from
2024
+ // under it rest at its left edge; panels beyond the current panel park
2025
+ // just past its right edge — both keep their last width. Deeper panels
2026
+ // layer over shallower ones, each on the odd layer for its depth (see
2027
+ // LAYER_STEP).
2028
+ place(el, shown ? x : i > cur ? left + runSum : left, entry.width, LAYER_STEP * i + 1);
2047
2029
  // What `$panel.visible` and `$panel.width` report: this pass is the one
2048
2030
  // thing that knows them, window resizes included. Written only on a
2049
2031
  // change, so per-panel UI hanging off them isn't rebuilt by every pass.
@@ -2122,22 +2104,6 @@ function firstText(el: HTMLElement): string | undefined {
2122
2104
  }
2123
2105
  }
2124
2106
 
2125
- /**
2126
- * Put a panel's address on the clipboard, as the absolute URL someone can paste
2127
- * anywhere — which is what the browser's own "Copy link" would have given them.
2128
- * Confirmed with a toast, since a silent copy leaves you wondering; `writeText`
2129
- * needs a secure context, so a failure says so rather than lying.
2130
- */
2131
- async function copyLink(path: string): Promise<void> {
2132
- const url = new URL(path, location.href).href;
2133
- try {
2134
- await navigator.clipboard.writeText(url);
2135
- toast({ message: "Link copied." });
2136
- } catch {
2137
- toast({ message: "Couldn't copy the link.", type: "danger" });
2138
- }
2139
- }
2140
-
2141
2107
  function drawDefaultNotFound($panel: Panel<{}>): void {
2142
2108
  A("p fg:$s-muted", () => A("#", `No panel at ${$panel.path}`));
2143
2109
  }