mirror of
https://github.com/expo/explore.git
synced 2026-11-15 13:18:16 -10:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
431105ff49 | ||
|
|
c9ab89025b | ||
|
|
72bdb8772c | ||
|
|
4ed584c990 | ||
|
|
f2de6c9002 |
No files matched your search
@@ -0,0 +1,9 @@
|
||||
# Ideas
|
||||
|
||||
Plans for work we may build later. An idea records the problem, the evidence
|
||||
for it, and a plan someone can pick up. Nothing here is scheduled. Defects that
|
||||
CI hits today belong in [`issues/`](../issues/README.md), not here.
|
||||
|
||||
Start each file with its status: `Not started`, `In progress` (with a link to
|
||||
the branch or PR), or `Built` (with a link to what shipped). Line references
|
||||
are to the commit named at the top of each file and will drift.
|
||||
@@ -0,0 +1,245 @@
|
||||
# Capture base and head under the same conditions
|
||||
|
||||
Status: Not started. Line references are to `4ed584c9` (Release 0.20.7).
|
||||
|
||||
A review compares a route's base frame with its head frame and reports the
|
||||
difference as the PR's change. That only holds when both frames were captured
|
||||
from the same app state and the same keyboard. Today neither is guaranteed,
|
||||
and a screen the PR did not touch can lead the comment with a large change.
|
||||
|
||||
## What we saw
|
||||
|
||||
In euxy#176's 0.20.7 review (iPhone, runs 39521260432 head and 39521251171
|
||||
baseline), two rows were wrong:
|
||||
|
||||
1. **App state.** Dark `/rename-pattern` showed "Untitled" on base and
|
||||
"Lo-Fi Bounce" on head. The row led with "Added button 'Pattern Lo-Fi
|
||||
Bounce — menu'".
|
||||
2. **Keyboard.** The software keyboard was drawn in some captures of the
|
||||
autofocused rename sheet and not others, a 46–48% visual mismatch.
|
||||
`keyboard.jsonl` said `shown` for every frame, drawn or not.
|
||||
|
||||
## Why
|
||||
|
||||
**App data carries from one appearance pass to the next.** Head ran light
|
||||
routes 1–16 and then dark routes 1–16 in one session. The light pass's `/p`
|
||||
import (routes 10–11) appends a pattern and makes it active, persisted in
|
||||
sqlite:
|
||||
|
||||
```ts
|
||||
// euxy src/state/store.ts
|
||||
patterns: [...s.patterns, pattern],
|
||||
activePatternId: pattern.id,
|
||||
```
|
||||
|
||||
euxy captures with `launch: video`, so the dark pass relaunches through
|
||||
`captureLaunch` ([`run.ts:1030`](../src/capture/run.ts)), which keeps app data
|
||||
on purpose. Launch errors there are caught and logged, and routes are captured
|
||||
anyway. The plain relaunch at [`run.ts:1041`](../src/capture/run.ts) only runs
|
||||
when launch observation is off. The baseline split light and dark into fresh
|
||||
sessions, so its dark pass started clean. Session layout is excluded from the
|
||||
capture recipe on the grounds that it does not change the evidence
|
||||
([`artifact-cache.ts:34`](../src/ci/artifact-cache.ts)), which is not true
|
||||
today.
|
||||
|
||||
**Partial baseline reuse changes the order.** When only some routes are cached,
|
||||
the base side captures just the rest
|
||||
([`run.ts:357`](../src/capture/run.ts)):
|
||||
|
||||
```ts
|
||||
const missingRoutes = routes.filter(route => !cachedImages[route.id]);
|
||||
```
|
||||
|
||||
Those frames see a different history within the pass from head's.
|
||||
|
||||
**"Shown" is only the accessibility tree's word.** `keyboardSettle`
|
||||
([`keyboard.ts`](../src/capture/keyboard.ts)) reports `shown` after two
|
||||
matching tree reads, including frames with no keyboard drawn.
|
||||
`keyboard.jsonl` is not in the exported diagnostics
|
||||
([`run.ts:384`](../src/capture/run.ts)).
|
||||
|
||||
**A caveat cannot win the row.** `decideReview`
|
||||
([`evidence-assessment.ts:471`](../src/review/evidence-assessment.ts)) makes
|
||||
any difference `modified` and uses the first fact as the description:
|
||||
|
||||
```ts
|
||||
const differs = visual.verdict === "modified" || changes.length > 0;
|
||||
```
|
||||
|
||||
Review issues are appended only when there are no facts. Added and removed
|
||||
elements rank ahead of text changes (priority 20 vs 30,
|
||||
[`evidence-comparator.ts:143`](../src/review/evidence-comparator.ts)). With the
|
||||
keyboard up, euxy's raised sheet covers Hat, Clap and Bass, so those become the
|
||||
leading "Added/Removed button" facts.
|
||||
|
||||
**Reinstalling is not a clean slate.** Argent's `reinstall-app`
|
||||
([`argent-driver.ts:712`](../src/capture/argent-driver.ts)) uninstalls and
|
||||
installs, but ignores uninstall errors. iOS keychain and SecureStore data
|
||||
survive an uninstall. EAS `simulator:control` has no clear-data, keychain or
|
||||
keyboard action.
|
||||
|
||||
## Goal
|
||||
|
||||
For each route, base and head frames in the same appearance come from the same
|
||||
app history and an equally verified keyboard state, whatever the session layout
|
||||
and including reused baselines. Where the conditions still differ, the row says
|
||||
so instead of reporting a PR change. Real text changes are still reported.
|
||||
|
||||
Done means:
|
||||
|
||||
- Rerun euxy#176 against a fresh baseline. Dark `/rename-pattern` and
|
||||
`/patterns` show the same pattern on both sides.
|
||||
- Each keyboard screen either draws the keyboard on both sides, or reads
|
||||
"Added text 'Pattern name' · keyboard shown on one side only". It no longer
|
||||
leads with a 46% visual change or with buttons the sheet covers.
|
||||
- An unchanged screen with an autofocused field is never a PR change.
|
||||
|
||||
## Plan
|
||||
|
||||
### Phase 0: probes and diagnostics
|
||||
|
||||
These results decide whether phase 2 goes ahead and which reset each backend
|
||||
uses.
|
||||
|
||||
1. **Fuller keyboard log.** Add the scheme, the pass, the tree's keyboard
|
||||
bounds, Argent's `keyboardVisible`, the screen size and the app's keyboard
|
||||
metrics to `keyboard.jsonl`, and export it.
|
||||
2. **App-side keyboard probe on EAS**, with Argent and with agent-device. Read
|
||||
`Keyboard.metrics()` and the show and hide events, and work out how much of
|
||||
the window the keyboard covers. Compare that with a screenshot, a tree read,
|
||||
and a second screenshot about 2 s later. Capture at least one session where
|
||||
the keyboard is not drawn. The question is whether any signal separates
|
||||
drawn from not drawn, and whether a missing keyboard is a late draw or a
|
||||
suppressed one.
|
||||
3. **Reset probe.** Write a test value into app storage through a fixture
|
||||
app's deep link, reinstall through each controller on EAS and locally, and
|
||||
check that it is gone. Check the keychain too, and time each reset.
|
||||
|
||||
### Phase 1: identical app history
|
||||
|
||||
4. **`resetAppData` per backend**, using what phase 0 verified:
|
||||
- Argent: `reinstall-app`, checked with the test value.
|
||||
- agent-device: uninstall, then install.
|
||||
- Local iOS: `simctl uninstall` and `install`, plus
|
||||
`simctl keychain <udid> reset`.
|
||||
- Local Android: `pm clear`.
|
||||
|
||||
Reuse the built `localApp`. Any other backend reports `unsupported`.
|
||||
5. **Reset at the start of every later captured pass** (`capturePass` in
|
||||
`run.ts`):
|
||||
- Run it before appearance and launch observation, so it covers
|
||||
`launch: video` and `launch: off` alike.
|
||||
- Count the passes captured in this session, not the loop index. A
|
||||
dark-only split session starts at index 1.
|
||||
- A failed reset escapes into the per-pass `try` and lands in
|
||||
`sessionFailures`, not in the launch catch.
|
||||
- Clear `deepLinkPromptAccepted` in the bridge's install case and approve
|
||||
URL schemes again.
|
||||
6. **Fall back to separate sessions.** When no verified reset exists, or the
|
||||
app keeps state in the keychain on EAS, run each appearance in its own
|
||||
session ([`session-plan.ts`](../src/ci/session-plan.ts)).
|
||||
7. **Same history on both sides.**
|
||||
- Reuse a baseline pass only if every selected route in it is cached;
|
||||
otherwise capture the whole pass.
|
||||
- Capture routes that exist on only one side last in that side's pass.
|
||||
- Record `passStart: "fresh" | "continued"` and `reused` on each image
|
||||
entry.
|
||||
8. **Cache recipe.** Add `passStart` to `captureRecipeConfig`, so a capture
|
||||
without the reset is never reused against one with it, even without a
|
||||
version bump. Reword the `maxSessions` comment.
|
||||
|
||||
### Phase 2: keyboard state and an honest row
|
||||
|
||||
Only if phase 0 finds a signal that separates a drawn keyboard from an
|
||||
undrawn one.
|
||||
|
||||
9. **Keyboard signal from the app.** The observer
|
||||
([`observer.ts`](../src/capture/observer.ts)) reads `Keyboard.metrics()`
|
||||
when it mounts, then listens for show and hide. Add the key to the
|
||||
`parseCaptureDestination` allowlist so it never becomes a text node.
|
||||
10. **Three-state wait:**
|
||||
- `shown` when the tree and the app agree;
|
||||
- `suppressed` after two reads with the tree stable and the app reporting
|
||||
no coverage, without waiting out the 4 s cap;
|
||||
- `unknown` when the app gives no signal.
|
||||
11. **Tie the state to the screenshot.** Read it just before and just after
|
||||
the screenshot ([`route-capture.ts`](../src/capture/route-capture.ts)). If
|
||||
it changed, retake once, or record `unstable`. Store it on
|
||||
`images[id].keyboard` so it survives the scheme merge, `export-merge`,
|
||||
restore and the schema.
|
||||
12. **Review rule** (`evidence-assessment.ts`, after the facts are computed).
|
||||
It applies when the two sides' states differ, or when either is `unknown`
|
||||
or `unstable` on a screen with a focused text field. Then:
|
||||
- mark the visual verdict not comparable;
|
||||
- drop added or removed elements that sit where the other side's raised
|
||||
sheet or keyboard would cover them;
|
||||
- keep paired text edits, and text inside the focused container;
|
||||
- if text facts remain, the row is `modified` with the keyboard caveat
|
||||
appended to the description after `decideReview`;
|
||||
- otherwise a `scope === "none"` screen stays a variant, and anything else
|
||||
is `needs-review` with the caveat;
|
||||
- show the caveat in the PR comment and the Viewer.
|
||||
13. **Keep the keyboard on screen where possible.** Local Android:
|
||||
`settings put secure show_ime_with_hard_keyboard 1`. EAS: a serve-sim
|
||||
action, if one is added. Local iOS boots headless, so phase 0 confirms
|
||||
whether the Simulator.app preference applies.
|
||||
|
||||
### Rejected
|
||||
|
||||
- Dismissing the keyboard: Return submits euxy's sheet.
|
||||
- Masking the keyboard band: the sheet shift is most of the mismatch.
|
||||
- Detecting the keyboard from pixels: brittle across keyboards and themes.
|
||||
- A fresh context for every route: cost, and
|
||||
[`route-reset.ts`](../src/capture/route-reset.ts) records the settle
|
||||
failures that led away from it.
|
||||
- Replaying the other side's history: fragile; whole-pass reuse covers the
|
||||
case.
|
||||
|
||||
## Risks
|
||||
|
||||
- **Cost:** about 25 s of reset per extra pass, measured in phase 0.
|
||||
Whole-pass reuse costs more only when a pass is partly cached.
|
||||
- **No usable keyboard signal:** phase 2 ships only the "keyboard couldn't be
|
||||
verified" path.
|
||||
- **A real change hidden behind the sheet gets dropped:** the visual verdict is
|
||||
already not comparable there, and the caveat flags the screen for a person.
|
||||
- **New fields lost in merge or restore:** one test runs them through every
|
||||
step.
|
||||
|
||||
## Tests
|
||||
|
||||
- **`ci-map`:** reset before later passes with `launch: video` and
|
||||
`launch: off`; no reset for a dark-only first pass; a failed reset lands in
|
||||
`sessionFailures`; the session split when no reset exists; whole-pass reuse;
|
||||
one-side-only routes last.
|
||||
- **`keyboard`:** each state, Android `keyboardVisible`, and an `unstable`
|
||||
change around the screenshot.
|
||||
- **Observer:** the keyboard key never becomes a text node.
|
||||
- **Merge, cache and schema:** `images[id].keyboard` and `passStart` survive.
|
||||
- **Assessment, on the real rename trees from the runs above:** covered Hat,
|
||||
Clap and Bass are dropped; "Pattern name" carries the caveat; an unchanged
|
||||
autofocus screen is not a PR change; the comment row wording.
|
||||
- **Local end to end:** force no keyboard on Android
|
||||
(`show_ime_with_hard_keyboard 0` with a hardware keyboard) and check the
|
||||
recorded state and the row.
|
||||
- **Real run:** a fresh euxy baseline, then #176. Check the reset log and
|
||||
timing, dark rename and `/patterns`, `keyboard.jsonl`, and the row wording.
|
||||
|
||||
## Open questions
|
||||
|
||||
1. Can serve-sim add clear-app-data, keychain-reset and hardware-keyboard
|
||||
actions to EAS sessions? Without them, EAS relies on Argent's reinstall and
|
||||
on separate sessions for apps that keep state in the keychain.
|
||||
2. Is about 25 s per extra appearance pass acceptable by default, or should
|
||||
the reset be a setting?
|
||||
3. If phase 0 finds no signal that separates a drawn keyboard from an undrawn
|
||||
one, is labelling every focused-field screen with a differing or unverified
|
||||
keyboard as "keyboard couldn't be verified" acceptable?
|
||||
|
||||
## How this plan was made
|
||||
|
||||
Codex `gpt-6-astra`, Grok `grok-4.7` and Claude each wrote a plan
|
||||
independently. Each plan was reviewed by a different model, merged, and the
|
||||
merged plan reviewed again by all three, at high effort. The backbone is
|
||||
Claude's; the per-frame condition record came from Codex's; keeping the
|
||||
keyboard on screen and rejecting dismissal came from Grok's.
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@expo/explore",
|
||||
"version": "0.20.6",
|
||||
"version": "0.21.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@expo/explore",
|
||||
"version": "0.20.6",
|
||||
"version": "0.21.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@expo/repack-app": "0.10.1",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@expo/explore",
|
||||
"version": "0.20.6",
|
||||
"version": "0.21.0",
|
||||
"description": "Source-driven mobile app maps, deterministic CI capture, and visual reviews",
|
||||
"license": "MIT",
|
||||
"type": "module",
|
||||
|
||||
@@ -897,7 +897,7 @@ async function prepareHostedRepack(options: {
|
||||
const environment = options.repackProfile.easEnvironment;
|
||||
const variables = easEnvironmentSnapshot(scope => {
|
||||
try {
|
||||
const listedVariables = options.runner({ command: options.easCommand, args: ["env:list", "--environment", environment, "--scope", scope, "--format", "long", "--non-interactive"],
|
||||
const listedVariables = options.runner({ command: options.easCommand, args: ["env:list", "--environment", environment, "--scope", scope, "--format", "long"],
|
||||
cwd: options.project, environment: privateEnvironment, timeoutMs: 2 * 60_000 });
|
||||
return listedVariables.stdout;
|
||||
} catch { return undefined; }
|
||||
|
||||
@@ -2342,6 +2342,18 @@ test("on a phone, a Screens card's screenshot keeps its height while it loads an
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test("the Screens filmstrip shows a downloaded report's screenshots, resolved as the grid's are", { timeout: 60_000 }, async t => {
|
||||
const { bytes } = await changedScreensArchive(3);
|
||||
const { page, errors } = await harness(t, bytes, { app: true, open: false });
|
||||
await chooseFile(page, bytes);
|
||||
await expect(page.locator(".app-shell")).toBeVisible();
|
||||
await page.goto(`${page.url().split("#")[0]}#/screens?layout=filmstrip`);
|
||||
const middle = page.locator(".screens-strip-frame.focused img");
|
||||
await expect(middle).toHaveAttribute("data-screenshot-state", "ready");
|
||||
assert.match(await middle.getAttribute("src"), /^blob:/);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test("a target switch blanks every card whose screenshot differs, never showing the other target's picture, and switching back reuses the kept pictures", { timeout: 90_000 }, async t => {
|
||||
const runtime = { platform: "android", platforms: ["ios", "android"] };
|
||||
const android = await changedScreensArchive(3, { seed: 1, runtime });
|
||||
|
||||
@@ -453,7 +453,8 @@ test("a fold tried during a find changes nothing: the tree's own folds come back
|
||||
await expect(other).toHaveAttribute("aria-expanded", "true");
|
||||
await field.press("Escape");
|
||||
await field.press("Escape");
|
||||
await expect(field).toHaveCount(0);
|
||||
await expect(field).toHaveValue("");
|
||||
await expect(field).not.toBeFocused();
|
||||
await expect(folder).toHaveAttribute("aria-expanded", "false");
|
||||
await expect(other).toHaveAttribute("aria-expanded", "true");
|
||||
|
||||
|
||||
+244
-12
@@ -1402,6 +1402,236 @@ test("→ steps the Screens cards right after Screens is opened from the toolbar
|
||||
await expect(grid.locator(`.screens-cell[data-screen-id="${expected}"] .screen-screenshot-card`)).toHaveClass(/selected/);
|
||||
});
|
||||
|
||||
test("the Screens sidebar is headed by its find field with fold-all beside it, and Changed / All sits under it only when there are changes", async ({ page }) => {
|
||||
// The fixture server's own report has no baseline, so no changes.
|
||||
await page.goto("/screens");
|
||||
const tree = page.getByRole("main", { name: "Screens" }).locator(".screens-tree");
|
||||
const head = tree.locator(".screens-tree-head");
|
||||
const field = head.getByRole("searchbox", { name: "Find screens" });
|
||||
await expect(field).toBeVisible();
|
||||
await expect(field).toHaveAttribute("placeholder", "Search");
|
||||
await expect(head.getByRole("button", { name: "Collapse all" })).toBeVisible();
|
||||
await expect(tree.locator(".screens-filter")).toHaveCount(0);
|
||||
// Nothing sits above the field.
|
||||
const treeBox = (await tree.boundingBox())!;
|
||||
expect((await head.boundingBox())!.y - treeBox.y).toBeLessThan(16);
|
||||
|
||||
await serveWorkspace(page);
|
||||
await page.goto("/screens");
|
||||
const filter = tree.locator(".screens-filter");
|
||||
await expect(filter).toBeVisible();
|
||||
// Under the head, as wide as it.
|
||||
const headBox = (await head.boundingBox())!;
|
||||
const filterBox = (await filter.boundingBox())!;
|
||||
expect(filterBox.y).toBeGreaterThanOrEqual(headBox.y + headBox.height);
|
||||
expect(Math.abs(filterBox.width - headBox.width)).toBeLessThan(2);
|
||||
});
|
||||
|
||||
test("Screens' filmstrip: switched from the corner switch, stepped with the arrows and clicks, opened by a double-click, left with Esc, and remembered", async ({ page }) => {
|
||||
await serveWorkspace(page);
|
||||
await page.goto("/screens");
|
||||
const view = page.getByRole("main", { name: "Screens" });
|
||||
await view.getByRole("button", { name: /^All/ }).click();
|
||||
const cells = view.locator(".screens-grid .screens-cell");
|
||||
const ids = await cells.evaluateAll(elements => elements.map(element => element.getAttribute("data-screen-id")!));
|
||||
expect(ids.length).toBeGreaterThan(2);
|
||||
const layouts = page.getByRole("group", { name: "Screens layout" });
|
||||
await expect(layouts.getByRole("button", { name: "Grid" })).toHaveAttribute("aria-pressed", "true");
|
||||
|
||||
// The switch at the top right opens the filmstrip at the first screen, with nothing selected yet.
|
||||
await layouts.getByRole("button", { name: "Filmstrip" }).click();
|
||||
await expect(page).toHaveURL(/[?&]layout=filmstrip/);
|
||||
const strip = view.getByRole("region", { name: "Filmstrip" });
|
||||
const middle = strip.locator(".screens-strip-frame.focused");
|
||||
await expect(middle).toHaveAttribute("data-screen-id", ids[0]!);
|
||||
await expect(cells).toHaveCount(0);
|
||||
// The sidebar is folded, and `/` opens it with the find field focused.
|
||||
await expect(view.locator(".screens-tree")).toHaveCount(0);
|
||||
|
||||
// In the find field, ↓ and ↑ step from the screen in the middle too; Esc then hands the keyboard back.
|
||||
await page.keyboard.press("/");
|
||||
const field = view.getByRole("searchbox", { name: "Find screens" });
|
||||
await expect(field).toBeFocused();
|
||||
await page.keyboard.press("ArrowDown");
|
||||
await expect(middle).toHaveAttribute("data-screen-id", ids[1]!);
|
||||
await page.keyboard.press("ArrowUp");
|
||||
await expect(middle).toHaveAttribute("data-screen-id", ids[0]!);
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(field).not.toBeFocused();
|
||||
await expect(strip).toBeVisible();
|
||||
|
||||
// → steps the middle frame through the screens in the grid's order.
|
||||
await page.keyboard.press("ArrowRight");
|
||||
await expect(middle).toHaveAttribute("data-screen-id", ids[1]!);
|
||||
await expect(middle.locator(".screens-strip-target")).toBeFocused();
|
||||
await page.keyboard.press("ArrowRight");
|
||||
await expect(middle).toHaveAttribute("data-screen-id", ids[2]!);
|
||||
await page.keyboard.press("ArrowLeft");
|
||||
await expect(middle).toHaveAttribute("data-screen-id", ids[1]!);
|
||||
// A neighbour comes to the middle when clicked, without opening the Inspector.
|
||||
const inspector = page.getByRole("complementary", { name: "Inspector panel" });
|
||||
await strip.locator(`.screens-strip-frame[data-screen-id="${ids[2]}"] .screens-strip-target`).click();
|
||||
await expect(middle).toHaveAttribute("data-screen-id", ids[2]!);
|
||||
await expect(inspector).toBeHidden();
|
||||
|
||||
// The switch's Grid goes back to the grid, keeping the selection.
|
||||
await layouts.getByRole("button", { name: "Grid" }).click();
|
||||
await expect(page).not.toHaveURL(/layout=/);
|
||||
await expect(view.locator(`.screens-cell[data-screen-id="${ids[2]}"] .screen-screenshot-card`)).toHaveClass(/selected/);
|
||||
|
||||
// A double-click on a card opens it in the filmstrip. Its first click opens the Inspector, which narrows the grid: the
|
||||
// last card of the first row moves before the second click lands, and it is still that card that opens.
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(inspector).toBeHidden();
|
||||
const tops = await cells.evaluateAll(elements => elements.map(element => Math.round(element.getBoundingClientRect().top)));
|
||||
const last = ids[tops.filter(top => top === tops[0]).length - 1]!;
|
||||
const box = (await view.locator(`.screens-cell[data-screen-id="${last}"] .screen-screenshot-target`).boundingBox())!;
|
||||
const at = { x: box.x + box.width / 2, y: box.y + box.height / 2 };
|
||||
await page.mouse.click(at.x, at.y);
|
||||
await expect(inspector).toBeVisible();
|
||||
// The second click of the pair, where the pointer still is.
|
||||
await page.mouse.down({ clickCount: 2 });
|
||||
await page.mouse.up({ clickCount: 2 });
|
||||
await expect(middle).toHaveAttribute("data-screen-id", last);
|
||||
await expect(inspector).toBeVisible();
|
||||
// Esc closes the Inspector first, then steps back out to the grid with the screen still picked.
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(inspector).toBeHidden();
|
||||
await expect(strip).toBeVisible();
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(strip).toHaveCount(0);
|
||||
await expect(view.locator(`.screens-cell[data-screen-id="${last}"] .screen-screenshot-card`)).toHaveClass(/selected/);
|
||||
|
||||
// The layout is remembered for the report: Screens opens in the filmstrip again after a visit to the Map.
|
||||
await layouts.getByRole("button", { name: "Filmstrip" }).click();
|
||||
await chooseCanvasView(page, "Map");
|
||||
await chooseCanvasView(page, "Screens");
|
||||
await expect(page).toHaveURL(/[?&]layout=filmstrip/);
|
||||
await expect(page.getByRole("region", { name: "Filmstrip" })).toBeVisible();
|
||||
});
|
||||
|
||||
test("Screens' filmstrip keeps Changed across a layout switch, opens only from a screenshot, and is remembered through Search and links", async ({ page }) => {
|
||||
await serveWorkspace(page);
|
||||
await page.goto("/screens");
|
||||
const view = page.getByRole("main", { name: "Screens" });
|
||||
const layouts = page.getByRole("group", { name: "Screens layout" });
|
||||
const strip = view.getByRole("region", { name: "Filmstrip" });
|
||||
const cells = view.locator(".screens-grid .screens-cell");
|
||||
const ids = () => cells.evaluateAll(elements => elements.map(element => element.getAttribute("data-screen-id")!));
|
||||
|
||||
// A double-click on a card's route copies a link and selects nothing, so it does not open the filmstrip.
|
||||
await view.getByRole("button", { name: /^All/ }).click();
|
||||
await cells.nth(1).locator(".screen-node-title").dblclick();
|
||||
await expect(strip).toHaveCount(0);
|
||||
// A click on one card and then a quick double-click on another opens the other.
|
||||
const [firstId, secondId] = await ids();
|
||||
await view.locator(`.screens-cell[data-screen-id="${firstId}"] .screen-screenshot-target`).click();
|
||||
await view.locator(`.screens-cell[data-screen-id="${secondId}"] .screen-screenshot-target`).dblclick();
|
||||
await expect(strip.locator(".screens-strip-frame.focused")).toHaveAttribute("data-screen-id", secondId!);
|
||||
await layouts.getByRole("button", { name: "Grid" }).click();
|
||||
await page.keyboard.press("Escape");
|
||||
|
||||
// A pick that Changed hides stays picked across a switch, and Changed stays on.
|
||||
const all = await ids();
|
||||
await view.getByRole("button", { name: /^Changed/ }).click();
|
||||
const changed = await ids();
|
||||
const hidden = all.find(id => !changed.includes(id));
|
||||
test.skip(!hidden, "the fixture has no unchanged screen");
|
||||
await view.getByRole("button", { name: /^All/ }).click();
|
||||
await view.locator(`.screens-cell[data-screen-id="${hidden}"] .screen-screenshot-target`).click();
|
||||
await page.keyboard.press("Escape");
|
||||
await view.getByRole("button", { name: /^Changed/ }).click();
|
||||
await layouts.getByRole("button", { name: "Filmstrip" }).click();
|
||||
// The sidebar folds away with Changed in it; the button left in its place says the screens are narrowed, and Changed
|
||||
// is still on behind it.
|
||||
const show = view.getByRole("button", { name: "Show sidebar, showing changed screens only" });
|
||||
await expect(show).toBeVisible();
|
||||
await show.click();
|
||||
await expect(view.getByRole("button", { name: "Hide sidebar" })).toBeFocused();
|
||||
await expect(view.getByRole("button", { name: /^Changed/ })).toHaveAttribute("aria-pressed", "true");
|
||||
// The middle is the nearest changed screen after the hidden pick in the tree, as the grid's arrows step from it.
|
||||
const at = all.indexOf(hidden!);
|
||||
const nearest = all.slice(at + 1).find(id => changed.includes(id)) ?? all.slice(0, at).reverse().find(id => changed.includes(id));
|
||||
await expect(strip.locator(".screens-strip-frame.focused")).toHaveAttribute("data-screen-id", nearest!);
|
||||
// A click on the page around the strip keeps the screen in the middle.
|
||||
await view.click({ position: { x: 600, y: 4 } });
|
||||
await expect(strip.locator(".screens-strip-frame.focused")).toHaveAttribute("data-screen-id", nearest!);
|
||||
// Folded again by hand, the keyboard moves to the button left in its place.
|
||||
await view.getByRole("button", { name: "Hide sidebar" }).click();
|
||||
await expect(show).toBeFocused();
|
||||
|
||||
// Search opens Screens in the remembered layout, and landing there does not forget it.
|
||||
await chooseCanvasView(page, "Map");
|
||||
await page.getByRole("toolbar", { name: "Canvas tools" }).getByRole("button", { name: "Search", exact: true }).click();
|
||||
const search = page.getByRole("dialog", { name: "Search Explore" });
|
||||
await search.getByRole("combobox").fill("/current-profile");
|
||||
await search.getByRole("option").filter({ hasText: "/current-profile" }).first().click();
|
||||
await expect(page).toHaveURL(/\/screens.*[?&]layout=filmstrip/);
|
||||
await expect(strip.locator(".screens-strip-frame.focused")).toHaveAttribute("data-screen-id", "current-profile");
|
||||
|
||||
// Switched back to the grid, Screens opens in the grid; a link that opens the filmstrip is remembered again.
|
||||
await layouts.getByRole("button", { name: "Grid" }).click();
|
||||
await chooseCanvasView(page, "Map");
|
||||
await chooseCanvasView(page, "Screens");
|
||||
await expect(page).not.toHaveURL(/layout=/);
|
||||
await page.goto("/screens?layout=filmstrip");
|
||||
await expect(strip).toBeVisible();
|
||||
await chooseCanvasView(page, "Map");
|
||||
await chooseCanvasView(page, "Screens");
|
||||
await expect(page).toHaveURL(/[?&]layout=filmstrip/);
|
||||
});
|
||||
|
||||
test("Screens' layouts switch with G and E, and the sidebar folds by its own buttons and on each switch to the filmstrip", async ({ page }) => {
|
||||
await serveWorkspace(page);
|
||||
await page.goto("/screens");
|
||||
const view = page.getByRole("main", { name: "Screens" });
|
||||
const tree = view.locator(".screens-tree");
|
||||
const strip = view.getByRole("region", { name: "Filmstrip" });
|
||||
const show = view.getByRole("button", { name: "Show sidebar" });
|
||||
|
||||
// The grid opens with the sidebar; its head folds it away, and the button left in its place opens it again.
|
||||
await expect(tree).toBeVisible();
|
||||
await tree.getByRole("button", { name: "Hide sidebar" }).click();
|
||||
await expect(tree).toHaveCount(0);
|
||||
await show.click();
|
||||
await expect(tree).toBeVisible();
|
||||
|
||||
// E opens the filmstrip, with the sidebar folded.
|
||||
await page.keyboard.press("e");
|
||||
await expect(page).toHaveURL(/[?&]layout=filmstrip/);
|
||||
await expect(strip).toBeVisible();
|
||||
await expect(tree).toHaveCount(0);
|
||||
// G goes back to the grid, with the sidebar open, even though it was opened in the filmstrip.
|
||||
await show.click();
|
||||
await page.keyboard.press("g");
|
||||
await expect(page).not.toHaveURL(/layout=/);
|
||||
await expect(strip).toHaveCount(0);
|
||||
await expect(tree).toBeVisible();
|
||||
// Each switch to the filmstrip folds the sidebar again.
|
||||
await page.keyboard.press("e");
|
||||
await expect(strip).toBeVisible();
|
||||
await expect(tree).toHaveCount(0);
|
||||
|
||||
// A find keeps the sidebar that shows it open on the switch to the filmstrip; folding the sidebar clears the find.
|
||||
await page.keyboard.press("g");
|
||||
const field = tree.getByRole("searchbox", { name: "Find screens" });
|
||||
const firstTitle = (await view.locator(".screens-grid .screens-cell .screen-node-title").first().textContent())!;
|
||||
await field.fill(firstTitle);
|
||||
await field.blur();
|
||||
await page.keyboard.press("e");
|
||||
await expect(strip).toBeVisible();
|
||||
await expect(tree).toBeVisible();
|
||||
await expect(field).toHaveValue(firstTitle);
|
||||
await tree.getByRole("button", { name: "Hide sidebar" }).click();
|
||||
await show.click();
|
||||
await expect(field).toHaveValue("");
|
||||
|
||||
// Elsewhere G and E do nothing.
|
||||
await chooseCanvasView(page, "Map");
|
||||
await page.keyboard.press("e");
|
||||
await expect(page).not.toHaveURL(/\/screens/);
|
||||
});
|
||||
|
||||
test("reuses the Map screenshot card in Screens, with the route under the screenshot at the card's left edge", async ({ page }) => {
|
||||
await serveWorkspace(page);
|
||||
await page.goto("/screens");
|
||||
@@ -5612,7 +5842,7 @@ test("in a window too short for it, the More menu scrolls", async ({ page }) =>
|
||||
await expect(page.getByRole("menu", { name: "More" }).getByRole("menuitem", { name: "Keyboard shortcuts" })).toBeInViewport({ ratio: 1 });
|
||||
});
|
||||
|
||||
test("the top right is the camera's alone: fit, center and zoom on the Map, nothing on Screens or Compare", async ({ page }) => {
|
||||
test("the top right holds the camera on the Map, the layout switch on Screens, and nothing on Compare", async ({ page }) => {
|
||||
await page.setViewportSize({ width: 1440, height: 900 });
|
||||
await serveWorkspace(page);
|
||||
await page.goto("/map");
|
||||
@@ -5631,7 +5861,7 @@ test("the top right is the camera's alone: fit, center and zoom on the Map, noth
|
||||
await expect(page).toHaveURL(/\/screens/);
|
||||
await expect(page.locator(".screens-page .screens-cell").first()).toBeVisible();
|
||||
await expect(page.locator(".canvas-camera-controls")).toHaveCount(0);
|
||||
expect(await topRightButtons(page)).toEqual([]);
|
||||
expect(await topRightButtons(page)).toEqual(["Grid", "Filmstrip"]);
|
||||
|
||||
await page.goto("/compare?screen=current-profile");
|
||||
await expect(page.getByRole("region", { name: /^Compare / })).toBeVisible();
|
||||
@@ -5653,13 +5883,13 @@ test("/ finds screens on the Screens page: the tree and the grid narrow to the q
|
||||
.find(segment => segment && titles.filter(title => title.includes(segment)).length < titles.length)!;
|
||||
expect(query).toBeTruthy();
|
||||
|
||||
// Opening the field does not move the tree under it: the head keeps one height in every state.
|
||||
const heading = grid.locator(".screens-tree h2");
|
||||
const headingTop = (await heading.boundingBox())!.y;
|
||||
// Opening the field does not move the tree under it: the field takes the title's row, which keeps one height.
|
||||
const firstRow = treeRows.first();
|
||||
const rowTop = (await firstRow.boundingBox())!.y;
|
||||
await page.keyboard.press("/");
|
||||
const field = grid.getByRole("searchbox", { name: "Find screens" });
|
||||
await expect(field).toBeFocused();
|
||||
expect((await heading.boundingBox())!.y).toBe(headingTop);
|
||||
expect((await firstRow.boundingBox())!.y).toBe(rowTop);
|
||||
await field.fill(query);
|
||||
const matching = titles.filter(title => title.toLowerCase().includes(query.toLowerCase()));
|
||||
await expect(cells).toHaveCount(matching.length);
|
||||
@@ -5690,9 +5920,10 @@ test("/ finds screens on the Screens page: the tree and the grid narrow to the q
|
||||
await field.press("Escape");
|
||||
await expect(field).toHaveValue("");
|
||||
await expect(cells).toHaveCount(all);
|
||||
// A second Esc hands the keyboard back to the page; the field stays, empty, at the head of the tree.
|
||||
await field.press("Escape");
|
||||
await expect(field).toHaveCount(0);
|
||||
await expect(grid.getByRole("button", { name: "Find a screen" })).toBeVisible();
|
||||
await expect(field).not.toBeFocused();
|
||||
await expect(field).toBeVisible();
|
||||
|
||||
// From the Map, "/" opens Screens with the field focused.
|
||||
await chooseCanvasView(page, "Map");
|
||||
@@ -5769,7 +6000,7 @@ test("⌘K steps through its results in the order it shows them, and a command t
|
||||
await expect(page.locator(".changes-menu-body")).toBeFocused();
|
||||
});
|
||||
|
||||
test("a / from the Map opens the find once: Screens opened again from the toolbar comes up without it", async ({ page }) => {
|
||||
test("a / from the Map focuses the find once: Screens opened again from the toolbar comes up with the field unfocused", async ({ page }) => {
|
||||
await serveWorkspace(page);
|
||||
await page.goto("/map");
|
||||
await page.keyboard.press("/");
|
||||
@@ -5777,13 +6008,14 @@ test("a / from the Map opens the find once: Screens opened again from the toolba
|
||||
const field = grid.getByRole("searchbox", { name: "Find screens" });
|
||||
await expect(field).toBeFocused();
|
||||
await field.press("Escape");
|
||||
await expect(field).toHaveCount(0);
|
||||
await expect(field).not.toBeFocused();
|
||||
|
||||
await chooseCanvasView(page, "Map");
|
||||
await chooseCanvasView(page, "Screens");
|
||||
await expect(grid.locator(".screens-grid .screens-cell").first()).toBeVisible();
|
||||
await expect(grid.getByRole("button", { name: "Find a screen" })).toBeVisible();
|
||||
await expect(field).toHaveCount(0);
|
||||
await expect(field).toBeVisible();
|
||||
await expect(field).not.toBeFocused();
|
||||
await expect(field).toHaveValue("");
|
||||
});
|
||||
|
||||
test("the find's keys stay in its field: Return on the clear button clears, and Return while composing text opens nothing", async ({ page }) => {
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { readFile, readdir } from "node:fs/promises";
|
||||
import { createRequire } from "node:module";
|
||||
import { join, relative } from "node:path";
|
||||
import test from "node:test";
|
||||
import { fileURLToPath } from "node:url";
|
||||
|
||||
// A fake EAS accepts any flag, so a flag the pinned eas-cli does not have passes every other test and fails only on a
|
||||
// real runner: 0.20.6 sent `env:list --non-interactive`, which eas-cli 25.2.0 refuses, so every capture logged "EAS did
|
||||
// not list the development environment's variables" and never shared a repack (brentvatne/euxy review run 39517635857).
|
||||
// Every literal `eas` command in src is checked against the command manifest of the eas-cli package.json pins.
|
||||
const root = fileURLToPath(new URL("../..", import.meta.url));
|
||||
const manifest = JSON.parse(await readFile(createRequire(join(root, "package.json")).resolve("eas-cli/oclif.manifest.json"), "utf8")).commands;
|
||||
const commands = new Map();
|
||||
for (const [id, command] of Object.entries(manifest)) {
|
||||
commands.set(id, command);
|
||||
for (const alias of command.aliases ?? []) commands.set(alias, command);
|
||||
}
|
||||
|
||||
async function sources(directory) {
|
||||
const files = [];
|
||||
for (const entry of await readdir(directory, { withFileTypes: true })) {
|
||||
const path = join(directory, entry.name);
|
||||
if (entry.isDirectory()) files.push(...await sources(path));
|
||||
else if (entry.name.endsWith(".ts")) files.push(path);
|
||||
}
|
||||
return files;
|
||||
}
|
||||
|
||||
test("every literal eas command in src names a flag the pinned eas-cli has", async () => {
|
||||
const checked = new Set();
|
||||
const unknown = [];
|
||||
for (const file of await sources(join(root, "src"))) {
|
||||
const text = await readFile(file, "utf8");
|
||||
// An argument list that starts with a command id, up to its closing bracket.
|
||||
for (const match of text.matchAll(/\[\s*"([a-z]+(?::[a-z-]+)+)"([^\]]*)\]/g)) {
|
||||
const command = commands.get(match[1]);
|
||||
if (!command) continue; // Explore's own commands (source:verify, explore:binary, …) share the shape.
|
||||
checked.add(match[1]);
|
||||
const flags = command.flags ?? {};
|
||||
for (const flag of match[2].matchAll(/"--([a-z0-9-]+)(?:=[^"]*)?"/g)) {
|
||||
if (!(flag[1] in flags)) unknown.push(`${relative(root, file)}: eas ${match[1]} --${flag[1]}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
assert.deepEqual(unknown, []);
|
||||
// The scan finds the commands capture depends on, so it cannot pass by matching nothing.
|
||||
for (const id of ["env:list", "build:list", "build:view", "workflow:run", "workflow:view", "workflow:cancel", "simulator:start", "simulator:stop", "simulator:control"]) {
|
||||
assert.ok(checked.has(id), `eas ${id} was not found in src`);
|
||||
}
|
||||
});
|
||||
@@ -257,6 +257,20 @@ test("semantic Map scope is discarded by non-Map canvases", () => {
|
||||
}
|
||||
});
|
||||
|
||||
test("Screens' filmstrip layout round-trips, and other canvases and unknown layouts drop it", () => {
|
||||
const route = { ...base, canvas: "screens", screen: "accessibility", layout: "filmstrip" };
|
||||
assert.equal(nav.formatRoute(route, ctx), "/screens?screen=accessibility&layout=filmstrip");
|
||||
assert.deepEqual(parse("/screens?screen=accessibility&layout=filmstrip"), route);
|
||||
// The grid is the default, so it is never written.
|
||||
assert.equal(nav.formatRoute({ ...base, canvas: "screens", layout: "grid" }, ctx), "/screens");
|
||||
assert.deepEqual(parse("/screens?layout=grid"), { ...base, canvas: "screens" });
|
||||
assert.deepEqual(parse("/screens?layout=nope"), { ...base, canvas: "screens" });
|
||||
for (const canvas of ["map", "compare"]) {
|
||||
assert.equal(nav.formatRoute({ ...base, canvas, layout: "filmstrip" }, ctx), `/${canvas}`);
|
||||
assert.deepEqual(parse(`/${canvas}?layout=filmstrip`), { ...base, canvas });
|
||||
}
|
||||
});
|
||||
|
||||
test("ids with reserved characters survive the query", () => {
|
||||
const route = { ...base, screen: "removed:a+b%c" };
|
||||
assert.deepEqual(parse(nav.formatRoute(route, ctx)), route);
|
||||
@@ -274,6 +288,7 @@ test("another target's report opens at the same canvas and route, keeping only w
|
||||
"#/compare/settings/profile?inspect=diff&dir=in&focus=modified,added");
|
||||
assert.equal(nav.placeForAnotherTarget("#/map/home"), "#/map/home");
|
||||
assert.equal(nav.placeForAnotherTarget("#/screens?screen=s-3"), "#/screens");
|
||||
assert.equal(nav.placeForAnotherTarget("#/screens?screen=s-3&layout=filmstrip"), "#/screens?layout=filmstrip");
|
||||
// No place, or a hash from before routes: the other report opens where a link to it would.
|
||||
assert.equal(nav.placeForAnotherTarget(""), "");
|
||||
assert.equal(nav.placeForAnotherTarget("#map"), "");
|
||||
|
||||
+38
-4
@@ -47,8 +47,10 @@ import {
|
||||
type MapDirection,
|
||||
type Route,
|
||||
type RouteContext,
|
||||
type ScreensLayout,
|
||||
type ThemePreference,
|
||||
} from "./utils/navigation";
|
||||
import { readScreensLayout, writeScreensLayout } from "./utils/screens-layout";
|
||||
import {
|
||||
CANVAS_NUMBER_KEYS,
|
||||
matchesShortcut,
|
||||
@@ -897,6 +899,12 @@ const ViewerApp = memo(function ViewerApp({ reportKey }: { reportKey: number })
|
||||
// Every canvas starts with the Inspector closed; selecting a screenshot opens the Inspector on
|
||||
// demand. A peer canvas is a fresh inventory, so a screen selection never travels with the reader
|
||||
// into the destination view.
|
||||
// The report Screens' layout is remembered for: the loaded one, however it was loaded.
|
||||
const runId = payload?.map.run.id;
|
||||
/** Screens opens in the layout the reader last left it in for this report; phones have only their list. */
|
||||
const rememberedScreensLayout = useCallback((canvas: CanvasView): Partial<Route> => (
|
||||
canvas === "screens" && routeRef.current.canvas !== "screens" && !phoneRef.current ? { layout: readScreensLayout(runId) } : {}
|
||||
), [runId]);
|
||||
const commitCanvasSelection = useCallback((canvas: CanvasView) => {
|
||||
const current = routeRef.current;
|
||||
if (canvas === "compare") {
|
||||
@@ -928,9 +936,22 @@ const ViewerApp = memo(function ViewerApp({ reportKey }: { reportKey: number })
|
||||
} : {
|
||||
canvas,
|
||||
...clearedCanvasSelection,
|
||||
...rememberedScreensLayout(canvas),
|
||||
},
|
||||
);
|
||||
}, [applyCanvasPanelDefaults, navigate]);
|
||||
}, [applyCanvasPanelDefaults, navigate, rememberedScreensLayout]);
|
||||
// Only a switch the reader makes is remembered as the grid: landing on Screens in the grid (from Search, Back or a
|
||||
// link) leaves a remembered filmstrip alone. The selection and its focus request carry over, so the Screens page
|
||||
// does not read the switch as a new pick that Changed or a find hides.
|
||||
const changeScreensLayout = useCallback((layout: ScreensLayout) => {
|
||||
writeScreensLayout(runId, layout);
|
||||
// A change of view, not a move: Back leaves Screens rather than undoing it, as the change filter's does.
|
||||
navigate({ layout: layout === "filmstrip" ? "filmstrip" : undefined }, { replace: true, preserveFocus: true });
|
||||
}, [navigate, runId]);
|
||||
// A link that opens the filmstrip is remembered as a switch to it is.
|
||||
useEffect(() => {
|
||||
if (route.canvas === "screens" && route.layout === "filmstrip" && !phone) writeScreensLayout(runId, "filmstrip");
|
||||
}, [phone, route.canvas, route.layout, runId]);
|
||||
|
||||
// The logo returns to the Map root, the equivalent of the "/map" URL.
|
||||
const openMapHome = useCallback(() => {
|
||||
@@ -1010,6 +1031,13 @@ const ViewerApp = memo(function ViewerApp({ reportKey }: { reportKey: number })
|
||||
if (event.key === "Escape") {
|
||||
if (routeRef.current.canvas === "compare") return;
|
||||
if (rightCollapsedRef.current) {
|
||||
// The filmstrip is a screen opened from the grid: Esc steps back out to the grid, keeping the selection.
|
||||
if (routeRef.current.canvas === "screens" && routeRef.current.layout === "filmstrip" && !phoneRef.current) {
|
||||
setTimeout(() => {
|
||||
if (!event.defaultPrevented) changeScreensLayout("grid");
|
||||
}, 0);
|
||||
return;
|
||||
}
|
||||
if (!resolveScreenId(routeRef.current, contextRef.current)) return;
|
||||
setTimeout(() => {
|
||||
if (!event.defaultPrevented) clearSelectedScreen();
|
||||
@@ -1056,6 +1084,9 @@ const ViewerApp = memo(function ViewerApp({ reportKey }: { reportKey: number })
|
||||
setChangesOpen((open) => !open);
|
||||
} else if (matchesShortcut(event, SHORTCUTS.panel.right)) {
|
||||
toggleRightPanel();
|
||||
} else if (matchesShortcut(event, SHORTCUTS.screens.grid) || matchesShortcut(event, SHORTCUTS.screens.filmstrip)) {
|
||||
if (routeRef.current.canvas !== "screens" || phoneRef.current) return;
|
||||
changeScreensLayout(matchesShortcut(event, SHORTCUTS.screens.grid) ? "grid" : "filmstrip");
|
||||
} else {
|
||||
const canvas = CANVAS_KEYS.find(([, shortcut]) => matchesShortcut(event, shortcut));
|
||||
if (!canvas) return;
|
||||
@@ -1067,7 +1098,7 @@ const ViewerApp = memo(function ViewerApp({ reportKey }: { reportKey: number })
|
||||
return () => {
|
||||
window.removeEventListener("keydown", onKeyDown);
|
||||
};
|
||||
}, [chooseAppearance, clearSelectedScreen, flipTheme, navigate, searchOpen, selectCanvas, toggleFullscreen, toggleRightPanel]);
|
||||
}, [changeScreensLayout, chooseAppearance, clearSelectedScreen, flipTheme, navigate, searchOpen, selectCanvas, toggleFullscreen, toggleRightPanel]);
|
||||
|
||||
// A side-panel row or a deep link is a "go to": the camera fits that screen and the step is
|
||||
// kept. Screens inventory clicks only select in place; Map clicks also focus the chosen screen. Repeating a selected target refits it without adding history.
|
||||
@@ -1134,10 +1165,11 @@ const ViewerApp = memo(function ViewerApp({ reportKey }: { reportKey: number })
|
||||
canvas: "screens",
|
||||
...screenPatch(screenId),
|
||||
expandedGroups: [],
|
||||
...rememberedScreensLayout("screens"),
|
||||
}, {
|
||||
resetCamera: true,
|
||||
});
|
||||
}, [applyCanvasPanelDefaults, navigate, screenPatch]);
|
||||
}, [applyCanvasPanelDefaults, navigate, rememberedScreensLayout, screenPatch]);
|
||||
// Following a row inside the inspector is the exception: a transition or changed screen is
|
||||
// read from a view the reader chose, and landing somewhere new is no
|
||||
// reason to close it. The panel stays where it was and only its subject changes.
|
||||
@@ -1656,6 +1688,8 @@ const ViewerApp = memo(function ViewerApp({ reportKey }: { reportKey: number })
|
||||
onSelectScreen={selectScreenOnCanvas}
|
||||
onPickScreen={pickScreenInPlace}
|
||||
onClearSelection={clearSelectedScreen}
|
||||
layout={route.layout ?? "grid"}
|
||||
onChangeLayout={changeScreensLayout}
|
||||
/>
|
||||
) : null}
|
||||
{comparing && phone && diff && selectedScreenId && comparePicker ? (
|
||||
@@ -1707,7 +1741,7 @@ const ViewerApp = memo(function ViewerApp({ reportKey }: { reportKey: number })
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
{/* Top right holds the camera only, so only the Map has anything there. */}
|
||||
{/* Top right holds the Map's camera; Screens puts its layout switch there itself. */}
|
||||
{phone || route.canvas !== "map" ? null : <CanvasCameraControls />}
|
||||
{phone ? (
|
||||
<PhoneTabBar
|
||||
|
||||
@@ -112,7 +112,8 @@ export function shortcutGroups(context: ShortcutContext): Group[][] {
|
||||
title: "Screens",
|
||||
rows: [
|
||||
{ label: "Move through the screens", keys: ["←", "→", "↑", "↓"] },
|
||||
{ label: "Close the inspector, then deselect", keys: ["Esc"] },
|
||||
{ label: "Grid or filmstrip", keys: [SHORTCUTS.screens.grid, SHORTCUTS.screens.filmstrip] },
|
||||
{ label: "Close the inspector, then leave the filmstrip or deselect", keys: ["Esc"] },
|
||||
],
|
||||
};
|
||||
const here: Group[] = context.canvas === "compare"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useRef } from "react";
|
||||
import { useRef, type ReactNode } from "react";
|
||||
import { Search, X } from "lucide-react";
|
||||
import "./panel-search.css";
|
||||
|
||||
@@ -9,6 +9,8 @@ type PanelSearchProps = {
|
||||
clearLabel: string;
|
||||
name?: string;
|
||||
autoFocus?: boolean;
|
||||
/** Shown at the field's end while it is empty, such as the key that focuses it. */
|
||||
hint?: ReactNode;
|
||||
onEscape?: () => void;
|
||||
onChange: (value: string) => void;
|
||||
};
|
||||
@@ -36,6 +38,7 @@ export function PanelSearch(props: PanelSearchProps) {
|
||||
}}
|
||||
onChange={(event) => props.onChange(event.target.value)}
|
||||
/>
|
||||
{props.value ? null : props.hint}
|
||||
{props.value && (
|
||||
<button
|
||||
type="button"
|
||||
|
||||
@@ -0,0 +1,174 @@
|
||||
import { useLayoutEffect, useMemo, useState } from "react";
|
||||
import { ChevronRight } from "lucide-react";
|
||||
import { artifactUrl, isLaunchScreen, type MapIndex, type Screen } from "../../utils/model";
|
||||
import { primaryScreenshotForScreen, screenshotSize, type ScreenshotSize } from "../../utils/screen-images";
|
||||
import { diffClass, type BuildDiff } from "../../utils/build-diff";
|
||||
import { screenLabel } from "../../utils/screen-path";
|
||||
import { treeNodeKey, type ScreenTree, type ScreenTreeIndex, type ScreenTreeNode } from "../../utils/screen-tree";
|
||||
import { ScreenshotImage } from "../shared/screenshot-image";
|
||||
|
||||
/** A neighbour's size and opacity by its distance from the screen in the middle. */
|
||||
const SCALES = [1, 0.74, 0.54, 0.4];
|
||||
const OPACITIES = [1, 0.9, 0.6, 0.3];
|
||||
const GAP = 32;
|
||||
/** An iPhone's portrait shape, for a run with no screenshot sizes at all. */
|
||||
const FALLBACK_SIZE: ScreenshotSize = { imageWidth: 390, imageHeight: 844 };
|
||||
|
||||
export type ScreensFilmstripProps = {
|
||||
/** The screens shown, in the tree's order. */
|
||||
order: readonly string[];
|
||||
/** The screen in the middle. */
|
||||
focusedId: string;
|
||||
selectedId?: string | undefined;
|
||||
index: MapIndex;
|
||||
diff?: BuildDiff | undefined;
|
||||
tree: ScreenTree;
|
||||
shape: ScreenTreeIndex;
|
||||
typicalSize?: ScreenshotSize | undefined;
|
||||
/** The element id a screen's frame takes, which the page's arrow keys focus by. */
|
||||
frameId: (id: string) => string;
|
||||
/** The tree's dot class for a screen: its status, shown beside its name as the grid and the tree show it. */
|
||||
dot: (id: string) => string | undefined;
|
||||
dimmed: (id: string) => boolean;
|
||||
/** Brings a screen to the middle without opening the Inspector. */
|
||||
onPick: (id: string) => void;
|
||||
/** Selects a screen and opens it in the Inspector, as a click on its card does. */
|
||||
onOpen: (id: string) => void;
|
||||
};
|
||||
|
||||
function labelOf(screen: Screen, index: MapIndex): string {
|
||||
return isLaunchScreen(screen) ? "Cold start" : screenLabel(screen, index);
|
||||
}
|
||||
|
||||
/** The stage's size, which the frames are fitted to. */
|
||||
function useSize(): [(element: HTMLDivElement | null) => void, { width: number; height: number }] {
|
||||
const [element, setElement] = useState<HTMLDivElement | null>(null);
|
||||
const [size, setSize] = useState({ width: 0, height: 0 });
|
||||
useLayoutEffect(() => {
|
||||
if (!element) return;
|
||||
const measure = () => setSize({ width: element.clientWidth, height: element.clientHeight });
|
||||
measure();
|
||||
if (typeof ResizeObserver === "undefined") return;
|
||||
const observer = new ResizeObserver(measure);
|
||||
observer.observe(element);
|
||||
return () => observer.disconnect();
|
||||
}, [element]);
|
||||
return [setElement, size];
|
||||
}
|
||||
|
||||
/**
|
||||
* Screens one at a time: the focused screen large in the middle, the screens before and after it smaller and fainter
|
||||
* the further they are, in the tree's order. Above it, the rows of the tree it was opened from, ending in its name with
|
||||
* its status dot. The neighbours, whose names are not shown, are outlined in their status colour instead.
|
||||
*/
|
||||
export function ScreensFilmstrip(props: ScreensFilmstripProps) {
|
||||
const [stageRef, stage] = useSize();
|
||||
const at = props.order.indexOf(props.focusedId);
|
||||
const focused = props.index.screens.get(props.focusedId);
|
||||
|
||||
// A row of the tree by its fold key, as the path above the frame names it.
|
||||
const rowLabels = useMemo(() => {
|
||||
const labels = new Map<string, string>();
|
||||
const walk = (nodes: readonly ScreenTreeNode[]) => {
|
||||
for (const node of nodes) {
|
||||
if (node.kind === "folder") labels.set(node.id, node.label);
|
||||
else {
|
||||
const screen = props.index.screens.get(node.screenId);
|
||||
if (screen) labels.set(treeNodeKey(node), labelOf(screen, props.index));
|
||||
}
|
||||
walk(node.children);
|
||||
}
|
||||
};
|
||||
walk(props.tree.tree);
|
||||
return labels;
|
||||
}, [props.index, props.tree]);
|
||||
|
||||
if (!focused || at < 0) return null;
|
||||
|
||||
const sizeOf = (screen: Screen) => screenshotSize(primaryScreenshotForScreen(screen, props.index)) ?? props.typicalSize ?? FALLBACK_SIZE;
|
||||
const aspect = (screen: Screen) => {
|
||||
const size = sizeOf(screen);
|
||||
return size.imageWidth / size.imageHeight;
|
||||
};
|
||||
// Every frame is laid out as the middle one would be, filling the stage's height short of growing wider than half
|
||||
// the stage, so a landscape capture beside portrait ones is as wide as it may be rather than as tall; then it is scaled
|
||||
// down around its centre, and the centres are spaced so the scaled frames sit a gap apart, the gap shrinking with them.
|
||||
const frameSize = (screen: Screen) => {
|
||||
const height = Math.max(0, Math.min(stage.height - 16, (stage.width * 0.5) / aspect(screen)));
|
||||
return { width: height * aspect(screen), height };
|
||||
};
|
||||
const middle = frameSize(focused);
|
||||
const frames: { id: string; screen: Screen; distance: number; x: number; width: number; height: number }[] = [
|
||||
{ id: props.focusedId, screen: focused, distance: 0, x: 0, ...middle },
|
||||
];
|
||||
for (const direction of [-1, 1]) {
|
||||
let edge = middle.width / 2;
|
||||
for (let distance = 1; distance < SCALES.length; distance++) {
|
||||
const id = props.order[at + direction * distance];
|
||||
const screen = id ? props.index.screens.get(id) : undefined;
|
||||
if (!id || !screen) break;
|
||||
const size = frameSize(screen);
|
||||
const scaled = size.width * SCALES[distance]!;
|
||||
const centre = edge + GAP * SCALES[distance]! + scaled / 2;
|
||||
frames.push({ id, screen, distance, x: direction * centre, ...size });
|
||||
edge = centre + scaled / 2;
|
||||
}
|
||||
}
|
||||
|
||||
const path = (props.shape.ancestors.get(props.focusedId) ?? []).flatMap(key => rowLabels.get(key) ?? []);
|
||||
const plain = props.index.plainTitles || isLaunchScreen(focused);
|
||||
const dot = props.dot(props.focusedId);
|
||||
|
||||
return (
|
||||
<section className="screens-strip" aria-label="Filmstrip">
|
||||
<div className="screens-strip-path">
|
||||
{path.map((label, position) => (
|
||||
<span key={position} className="screens-strip-crumb" title={label}>
|
||||
<span className={`screens-strip-crumb-label${plain ? "" : " path"}`}>{label}</span>
|
||||
<ChevronRight aria-hidden="true" />
|
||||
</span>
|
||||
))}
|
||||
<span className="screens-strip-crumb current" title={labelOf(focused, props.index)}>
|
||||
{dot ? <span className={`screens-tree-dot ${dot}`} aria-hidden="true" /> : null}
|
||||
<span className={`screens-strip-crumb-label${plain ? "" : " path"}`}>{labelOf(focused, props.index)}</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div ref={stageRef} className="screens-strip-stage">
|
||||
{stage.width > 0 ? frames.map(({ id, screen, distance, x, width, height }) => {
|
||||
const artifact = primaryScreenshotForScreen(screen, props.index);
|
||||
const url = artifactUrl(artifact);
|
||||
const size = screenshotSize(artifact);
|
||||
const placeholder = <span className="screens-strip-placeholder" aria-hidden="true" />;
|
||||
const frameDiff = props.diff?.screens.get(id);
|
||||
const scale = SCALES[distance]!;
|
||||
const label = labelOf(screen, props.index);
|
||||
return (
|
||||
<div key={id} id={props.frameId(id)} data-screen-id={id}
|
||||
className={`screens-strip-frame${distance === 0 ? " focused" : ""}${frameDiff ? ` ${diffClass(frameDiff)}` : ""}${props.dimmed(id) ? " dimmed" : ""}`}
|
||||
style={{
|
||||
width,
|
||||
height,
|
||||
opacity: OPACITIES[distance],
|
||||
zIndex: SCALES.length - distance,
|
||||
transform: `translate(-50%, -50%) translateX(${x}px) scale(${scale})`,
|
||||
}}>
|
||||
{/* Only the middle frame is in the tab order: the arrows step the strip, and focus on a neighbour the stage
|
||||
clips would scroll it off its centre. */}
|
||||
<button type="button" className="screens-strip-target" aria-label={label} title={distance === 0 ? undefined : label}
|
||||
tabIndex={distance === 0 ? undefined : -1}
|
||||
aria-pressed={props.selectedId === id} aria-current={distance === 0 ? "true" : undefined}
|
||||
onClick={() => (distance === 0 ? props.onOpen(id) : props.onPick(id))}>
|
||||
{/* A downloaded report's screenshot is a reference that ScreenshotImage resolves. */}
|
||||
{url ? (
|
||||
<ScreenshotImage src={url} alt="" draggable={false} decoding="async" loading={distance <= 1 ? "eager" : "lazy"}
|
||||
{...(size ? { width: size.imageWidth, height: size.imageHeight } : {})} fallback={placeholder} />
|
||||
) : placeholder}
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}) : null}
|
||||
</div>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
@@ -55,48 +55,65 @@
|
||||
border-radius: 14px;
|
||||
background: var(--side-panel-surface);
|
||||
}
|
||||
.screens-tree > h2 {
|
||||
margin: 0;
|
||||
padding: 4px 8px 10px;
|
||||
color: var(--tertiary);
|
||||
font-family: "JetBrains Mono", ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.04em;
|
||||
}
|
||||
.screens-tree ul { margin: 0; padding: 0; list-style: none; }
|
||||
/* Changed / All filter the tree and the grid alike, so they sit in the tree's head as one segmented control,
|
||||
beside the button that folds or unfolds every folder. */
|
||||
/* One height in every state (chips, the find field, or only the icons), so opening the find does not move the tree. */
|
||||
.screens-tree-head { display: flex; height: 34px; flex: none; align-items: center; gap: 6px; margin: 0 0 10px; }
|
||||
.screens-tree-head > .screens-filter {
|
||||
flex: 1;
|
||||
/* The tree's head: the find field, with fold-all beside it. */
|
||||
.screens-tree-head { display: flex; height: 34px; flex: none; align-items: center; gap: 4px; margin: 0 0 8px; }
|
||||
/* Changed / All filter the tree and the grid alike: one segmented control under the head, the tree's width. */
|
||||
.screens-tree > .screens-filter {
|
||||
flex: none;
|
||||
gap: 2px;
|
||||
margin: 0 0 10px;
|
||||
padding: 3px;
|
||||
border-radius: 9px;
|
||||
background: var(--element);
|
||||
}
|
||||
.screens-tree-fold-all {
|
||||
.screens-tree-fold-all,
|
||||
.screens-side-toggle {
|
||||
display: grid;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
flex: none;
|
||||
margin-left: auto;
|
||||
place-items: center;
|
||||
border-radius: 8px;
|
||||
color: var(--secondary);
|
||||
background: transparent;
|
||||
}
|
||||
.screens-tree-fold-all:hover { color: var(--text); background: var(--panel-hover); }
|
||||
.screens-tree-fold-all > svg { width: 16px; height: 16px; }
|
||||
.screens-tree-head > .screens-filter .screens-chip {
|
||||
.screens-tree-fold-all { margin-left: auto; }
|
||||
.screens-tree-fold-all:hover,
|
||||
.screens-side-toggle:hover { color: var(--text); background: var(--panel-hover); }
|
||||
.screens-tree-fold-all > svg,
|
||||
.screens-side-toggle > svg { width: 16px; height: 16px; }
|
||||
/* Folded, the sidebar is only the button that opens it, on the tree's surface at the tree's top. */
|
||||
.screens-side.collapsed { width: auto; }
|
||||
.screens-side.collapsed > .screens-side-toggle {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
border: 1px solid var(--border-subtle);
|
||||
border-radius: 10px;
|
||||
background: var(--side-panel-surface);
|
||||
}
|
||||
.screens-side.collapsed > .screens-side-toggle:hover { background: var(--panel-hover); }
|
||||
/* Folded under Changed: a dot on the button, in the changed colour, says the screens are narrowed. */
|
||||
.screens-side-toggle.narrowed { position: relative; }
|
||||
.screens-side-toggle.narrowed::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
top: 6px;
|
||||
right: 6px;
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
border: 1.5px solid var(--side-panel-surface);
|
||||
border-radius: 50%;
|
||||
background: var(--modified);
|
||||
}
|
||||
.screens-tree > .screens-filter .screens-chip {
|
||||
height: 28px;
|
||||
flex: 1;
|
||||
justify-content: center;
|
||||
border-radius: 7px;
|
||||
background: transparent;
|
||||
}
|
||||
.screens-tree-head > .screens-filter .screens-chip[aria-pressed="true"] { background: var(--selected); }
|
||||
.screens-tree > .screens-filter .screens-chip[aria-pressed="true"] { background: var(--selected); }
|
||||
.screens-tree-row {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
@@ -339,25 +356,125 @@ button.screens-tree-row:hover { color: var(--text); background: var(--panel-hove
|
||||
.screens-tree.phone .screens-tree-label.path { font-size: var(--phone-body-mono-size); }
|
||||
.screens-tree.phone .screens-tree-kind { font-size: var(--phone-micro-size); }
|
||||
|
||||
/* ── Find: `/` or the magnifier turns the tree's head into a field; the tree and the grid narrow to its matches ── */
|
||||
.screens-tree-head > .tooltip-anchor { display: flex; flex: none; margin-left: auto; }
|
||||
.screens-tree-head > .tooltip-anchor + .screens-tree-fold-all { margin-left: 0; }
|
||||
.screens-tree-find {
|
||||
/* ── Find: the field heading the tree, focused by `/`; the tree and the grid narrow to its matches ── */
|
||||
.screens-find { display: flex; min-width: 0; flex: 1; }
|
||||
.screens-find .panel-search { height: 34px; flex: 1; border-radius: 9px; }
|
||||
/* The key that focuses the field, at its end while it is empty and unfocused. */
|
||||
.screens-find-key {
|
||||
display: grid;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
min-width: 18px;
|
||||
height: 18px;
|
||||
flex: none;
|
||||
place-items: center;
|
||||
border-radius: 8px;
|
||||
color: var(--secondary);
|
||||
background: transparent;
|
||||
margin-right: 2px;
|
||||
padding: 0 4px;
|
||||
border: 1px solid var(--border-subtle);
|
||||
border-radius: 5px;
|
||||
color: var(--tertiary);
|
||||
background: var(--surface);
|
||||
font: 600 11px/1 var(--screens-mono);
|
||||
}
|
||||
.screens-tree-find:hover { color: var(--text); background: var(--panel-hover); }
|
||||
.screens-tree-find > svg { width: 16px; height: 16px; }
|
||||
.screens-tree-head.searching { gap: 4px; }
|
||||
.screens-find { display: flex; min-width: 0; flex: 1; }
|
||||
.screens-find .panel-search { height: 34px; border-radius: 9px; }
|
||||
.screens-find .panel-search:focus-within .screens-find-key { display: none; }
|
||||
.screens-find-empty { margin: 0; padding: 4px 8px; color: var(--tertiary); font-size: 12px; }
|
||||
.screens-empty { min-height: 240px; flex: 1; }
|
||||
.screens-empty-all { padding: 0; color: var(--accent); font: inherit; background: transparent; }
|
||||
.screens-empty-all:hover { text-decoration-line: underline; text-underline-offset: 3px; }
|
||||
|
||||
/* ── Filmstrip: one screen at a time, its neighbours smaller and fainter on either side ── */
|
||||
/* The page stops scrolling; the strip fills the height between the pill and the bottom toolbar. */
|
||||
.screens-page.filmstrip { overflow: hidden; padding-bottom: calc(84px * var(--ui-scale)); }
|
||||
.screens-page.filmstrip .screens-body { height: 100%; }
|
||||
.screens-page.filmstrip .screens-side { max-height: 100%; }
|
||||
.screens-page.filmstrip .screens-sections { display: flex; height: 100%; flex-wrap: nowrap; align-items: stretch; }
|
||||
.screens-strip { display: flex; min-width: 0; flex: 1; flex-direction: column; align-items: center; gap: 8px; }
|
||||
.screens-strip-path {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
min-height: 28px;
|
||||
flex: none;
|
||||
align-items: center;
|
||||
justify-content: safe center;
|
||||
gap: 6px;
|
||||
overflow: hidden;
|
||||
color: var(--tertiary);
|
||||
font-size: 13px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* A long route keeps the path to one line: the screen's name shrinks to an ellipsis, and each row above it is capped
|
||||
at a width of its own. A path still too long is cut at its end, not on both sides. */
|
||||
.screens-strip-crumb { display: inline-flex; min-width: 0; flex: 0 1 auto; align-items: center; gap: 6px; }
|
||||
.screens-strip-crumb:not(.current) { max-width: 160px; flex-shrink: 0; }
|
||||
.screens-strip-crumb > svg { width: 12px; height: 12px; flex: none; opacity: 0.7; }
|
||||
.screens-strip-crumb.current { flex-shrink: 1; gap: 7px; color: var(--text); font-weight: 600; }
|
||||
.screens-strip-crumb.current > .screens-tree-dot { flex: none; }
|
||||
.screens-strip-crumb.current > .screens-tree-dot[class*="diff-"] { background: var(--diff); }
|
||||
.screens-strip-crumb-label { min-width: 0; overflow: hidden; text-overflow: ellipsis; }
|
||||
.screens-strip-crumb-label.path { font-size: 12px; }
|
||||
.screens-strip-stage { position: relative; width: 100%; min-height: 0; flex: 1; overflow: hidden; overflow: clip; }
|
||||
.screens-strip-frame {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
/* A frame's size follows its screenshot's shape, so it eases with the move rather than snapping. */
|
||||
transition: transform 300ms cubic-bezier(0.2, 0.75, 0.2, 1), width 300ms cubic-bezier(0.2, 0.75, 0.2, 1), height 300ms cubic-bezier(0.2, 0.75, 0.2, 1), opacity 300ms ease;
|
||||
will-change: transform;
|
||||
}
|
||||
@media (prefers-reduced-motion: reduce) { .screens-strip-frame { transition: none; } }
|
||||
.screens-strip-frame.dimmed:not(.focused) { opacity: calc(var(--dim-out) * 0.6) !important; }
|
||||
.screens-strip-target {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
padding: 0;
|
||||
border: 1px solid var(--border-subtle);
|
||||
border-radius: 14px;
|
||||
background: var(--element);
|
||||
cursor: pointer;
|
||||
}
|
||||
.screens-strip-frame.focused .screens-strip-target {
|
||||
border-color: color-mix(in srgb, var(--text) 30%, var(--border-subtle));
|
||||
box-shadow: 0 24px 48px rgb(0 0 0 / 0.08), 0 2px 6px rgb(0 0 0 / 0.08);
|
||||
cursor: zoom-in;
|
||||
}
|
||||
/* A changed neighbour is outlined in its status colour; the middle screen's status is the dot beside its name. */
|
||||
.screens-strip-frame:not(.focused):is(.diff-added, .diff-modified, .diff-removed, .diff-accessibility-only, .diff-needs-review, .diff-source-affected) .screens-strip-target { outline: 2px solid var(--diff); outline-offset: 2px; }
|
||||
/* Focused by the arrows, the middle frame keeps its screenshot's own colours: the brightening that marks a focused
|
||||
pressed button elsewhere (styles.css) would change what is being reviewed. Being in the middle is its focus. */
|
||||
.screens-page .screens-strip-target:focus-visible { filter: none; }
|
||||
.screens-strip-target img { display: block; width: 100%; height: 100%; object-fit: contain; }
|
||||
.screens-strip-placeholder { display: block; width: 100%; height: 100%; }
|
||||
|
||||
/* ── Layout switch: Grid or Filmstrip, in words, at the top right in the pill's row ── */
|
||||
.screens-layout-switch {
|
||||
position: absolute;
|
||||
z-index: 20;
|
||||
top: var(--chrome-top);
|
||||
right: calc(var(--screens-switch-right, 0px) + var(--canvas-chrome-inline-inset));
|
||||
display: inline-flex;
|
||||
height: var(--chrome-height);
|
||||
align-items: stretch;
|
||||
gap: 2px;
|
||||
padding: calc(3px * var(--ui-scale));
|
||||
border: 1px solid var(--border-subtle);
|
||||
border-radius: calc(10px * var(--ui-scale));
|
||||
background: var(--side-panel-surface);
|
||||
box-shadow: var(--floating-chrome-shadow);
|
||||
}
|
||||
.screens-layout-switch button {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 7px;
|
||||
padding: 0 12px 0 10px;
|
||||
border-radius: calc(7px * var(--ui-scale));
|
||||
color: var(--secondary);
|
||||
background: transparent;
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
transition: color 120ms ease, background 120ms ease;
|
||||
}
|
||||
.screens-layout-switch button:hover { color: var(--text); background: var(--panel-hover); }
|
||||
.screens-layout-switch button[aria-pressed="true"] { color: var(--text); background: var(--selected); }
|
||||
.screens-layout-switch button > svg { width: 15px; height: 15px; flex: none; }
|
||||
.screens-layout-switch.compact button { padding: 0 9px; }
|
||||
.screens-layout-switch.compact button > span { display: none; }
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useEffect, useMemo, useRef, useState, type CSSProperties, type KeyboardEvent, type ReactNode } from "react";
|
||||
import { ChevronRight, ChevronsDownUp, ChevronsUpDown, ListTree, Search } from "lucide-react";
|
||||
import { useEffect, useMemo, useRef, useState, type CSSProperties, type KeyboardEvent, type MouseEvent as ReactMouseEvent, type ReactNode } from "react";
|
||||
import { ChevronRight, ChevronsDownUp, ChevronsUpDown, GalleryHorizontal, LayoutGrid, ListTree, PanelLeftClose, PanelLeftOpen } from "lucide-react";
|
||||
import { artifactUrl, isLaunchScreen, type ExploreMap, type MapIndex, type Screen } from "../../utils/model";
|
||||
import { primaryScreenshotForScreen, screenshotSize, typicalScreenshotSize, type ScreenshotSize } from "../../utils/screen-images";
|
||||
import { diffClass, type BuildDiff, type DiffStatus } from "../../utils/build-diff";
|
||||
@@ -7,8 +7,8 @@ import { focusStatusOf, isCapturedChange } from "../../utils/changed-screens";
|
||||
import { displayPathForScreen, screenLabel } from "../../utils/screen-path";
|
||||
import { screenTree, treeIndex, treeNodeKey, treeScreenOrder, type ScreenTree, type ScreenTreeNode } from "../../utils/screen-tree";
|
||||
import type { Appearance } from "../../utils/appearance";
|
||||
import type { FocusRequest, FocusStatus } from "../../utils/navigation";
|
||||
import { shortcutsLive } from "../../utils/shortcuts";
|
||||
import type { FocusRequest, FocusStatus, ScreensLayout } from "../../utils/navigation";
|
||||
import { formatShortcut, SHORTCUTS, shortcutsLive } from "../../utils/shortcuts";
|
||||
import { normalizeSearchText } from "../../utils/search";
|
||||
import { createKeyHold } from "../../utils/key-hold";
|
||||
import { placeholderScreen } from "../../utils/map-frame";
|
||||
@@ -19,6 +19,7 @@ import { useCanvasVisibleFrame } from "../canvas/visible-frame-provider";
|
||||
import { PhoneSheet } from "../phone/phone-chrome";
|
||||
import { PanelSearch } from "../shared/panel-search";
|
||||
import { Tooltip } from "../shared/tooltip";
|
||||
import { ScreensFilmstrip } from "./screens-filmstrip";
|
||||
import "./screens.css";
|
||||
|
||||
/** The statuses a tree dot marks. The Changed filter keeps only the screens whose captures differ (isCapturedChange). */
|
||||
@@ -52,6 +53,10 @@ export type ScreensViewProps = {
|
||||
onPickScreen?: ((id: string) => void) | undefined;
|
||||
/** A click on the page around the cards clears the selection, as a click on a canvas's pane does. */
|
||||
onClearSelection?: (() => void) | undefined;
|
||||
/** Desktop only: every card in a grid, or one screen at a time in a filmstrip. */
|
||||
layout?: ScreensLayout | undefined;
|
||||
/** A double-click on a card opens it in the filmstrip. */
|
||||
onChangeLayout?: ((layout: ScreensLayout) => void) | undefined;
|
||||
};
|
||||
|
||||
function statusOf(diff: BuildDiff | undefined, id: string): DiffStatus | undefined {
|
||||
@@ -85,6 +90,27 @@ function writeFolded(key: string, folded: ReadonlySet<string>): void {
|
||||
} catch { /* Folds last for this visit only. */ }
|
||||
}
|
||||
|
||||
/**
|
||||
* The canvas widths below which the layout switch drops its labels, and below which it is hidden: the pill at the top
|
||||
* left grows to 420px (`--left-collapsed-pill-width`), and the switch keeps clear of it, labelled or not.
|
||||
*/
|
||||
const SWITCH_LABELLED_FRAME_WIDTH = 640;
|
||||
const SWITCH_MINIMUM_FRAME_WIDTH = 540;
|
||||
|
||||
/** How soon, and how near, a second click follows the first to make a double-click that opens a card in the filmstrip. */
|
||||
const DOUBLE_CLICK_MS = 500;
|
||||
const DOUBLE_CLICK_SLOP_PX = 8;
|
||||
|
||||
/** A shown screen to stand for `selected`: itself, or the nearest shown screen after it in the tree, else before it. */
|
||||
function nearestShown(selected: string | undefined, shown: readonly string[], tree: readonly string[]): string | undefined {
|
||||
if (!selected) return undefined;
|
||||
if (shown.includes(selected)) return selected;
|
||||
const at = tree.indexOf(selected);
|
||||
if (at < 0) return undefined;
|
||||
const set = new Set(shown);
|
||||
return tree.slice(at + 1).find(id => set.has(id)) ?? tree.slice(0, at).reverse().find(id => set.has(id));
|
||||
}
|
||||
|
||||
/** The key that opens the find field: a character, not a key position, so it is read from the layout like "?". */
|
||||
export const FIND_KEY = "/";
|
||||
|
||||
@@ -159,7 +185,7 @@ function ScreenCell(props: {
|
||||
typicalSize?: ScreenshotSize | undefined;
|
||||
/** A phone's cell, whose screenshot is its own frame: no well frames it while it loads. */
|
||||
phone?: boolean | undefined;
|
||||
onSelect: () => void;
|
||||
onSelect: (event: ReactMouseEvent) => void;
|
||||
}) {
|
||||
const artifact = primaryScreenshotForScreen(props.screen, props.index);
|
||||
const url = artifactUrl(artifact);
|
||||
@@ -272,8 +298,9 @@ function Legend(props: { others: Appearance[] }) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Screens as a page that scrolls. On desktop, one grid of every screen in the order of the tree beside it; on a
|
||||
* phone, a section per route folder (or per tab, when there are no route files), with the tree behind a Tree button.
|
||||
* Screens as a page that scrolls. On desktop, one grid of every screen in the order of the tree beside it, or the same
|
||||
* screens one at a time in a filmstrip (screens-filmstrip.tsx); on a phone, a section per route folder (or per tab,
|
||||
* when there are no route files), with the tree behind a Tree button.
|
||||
*/
|
||||
export function ScreensView(props: ScreensViewProps) {
|
||||
// The report's screens, as the Map draws them: a public report's routes it never captured are not among them.
|
||||
@@ -295,10 +322,9 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
const [filter, setFilter] = useState<Filter>(props.phone && changedIds.size > 0 ? "changed" : "all");
|
||||
const [treeOpen, setTreeOpen] = useState(false);
|
||||
// Find: a query narrows the tree and the grid to the screens whose route or title contains it, inside Changed or All.
|
||||
const [findOpen, setFindOpen] = useState(false);
|
||||
const [query, setQuery] = useState("");
|
||||
// The phone layout has no field to show or clear a query, so a query typed on desktop does not narrow it.
|
||||
const findQuery = findOpen && !props.phone ? query : "";
|
||||
const findQuery = props.phone ? "" : query;
|
||||
const matches = useMemo(() => findMatches(screens, props.index, findQuery), [props.index, screens, findQuery]);
|
||||
const inChanged = filter === "changed" && changedIds.size > 0;
|
||||
const inFilter = inChanged ? changedIds : new Set(screens.map(screen => screen.id));
|
||||
@@ -310,6 +336,23 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
const treeOrder = useMemo(() => treeScreenOrder(tree), [tree]);
|
||||
const order = props.phone ? sections.flatMap(section => section.screenIds) : treeOrder.filter(id => shown.has(id));
|
||||
const others = [...new Set([...(props.changedElsewhere?.values() ?? [])].flat())];
|
||||
const filmstrip = !props.phone && props.layout === "filmstrip";
|
||||
// The filmstrip always has a screen in the middle: the selection when it is shown; else, when Changed or a find hides
|
||||
// it, the nearest shown screen after it in the tree (before it, at the end), as the grid's arrows step from it; else
|
||||
// the first screen.
|
||||
const stripFocus = filmstrip ? nearestShown(props.selectedScreenId, order, treeOrder) ?? order[0] : undefined;
|
||||
// The sidebar folds away to give the screens its width. Each switch of layout starts over: the filmstrip with the
|
||||
// sidebar folded, the grid with it open. A find's query lives only in the sidebar's field, so the sidebar stays open
|
||||
// while one narrows the screens. Changed folds away with it, and the button left in its place says it is on.
|
||||
const [side, setSide] = useState({ filmstrip, collapsed: filmstrip && !findQuery });
|
||||
if (side.filmstrip !== filmstrip) setSide({ filmstrip, collapsed: filmstrip && !findQuery });
|
||||
const sideCollapsed = side.filmstrip === filmstrip ? side.collapsed : filmstrip && !findQuery;
|
||||
const setSideCollapsed = (collapsed: boolean) => setSide({ filmstrip, collapsed });
|
||||
// A button that folds or opens the sidebar is replaced by the other one; the keyboard moves to it.
|
||||
const toggleSide = (collapsed: boolean) => {
|
||||
setSideCollapsed(collapsed);
|
||||
requestAnimationFrame(() => document.querySelector<HTMLElement>(".screens-side .screens-side-toggle")?.focus());
|
||||
};
|
||||
|
||||
// Folding. All keeps the reader's folds and remembers them per report. Changed folds separately, starting
|
||||
// each time with only the rows that hold no change folded, so trying Changed never disturbs the folds in All.
|
||||
@@ -363,49 +406,54 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
setTreeOpen(false);
|
||||
if (!inFilter.has(id)) setFilter("all");
|
||||
(props.onPickScreen ?? props.onSelectScreen)(id);
|
||||
requestAnimationFrame(() => document.getElementById(cardId(id))?.scrollIntoView({ block: "center", behavior: "smooth" }));
|
||||
// The filmstrip brings the screen to its middle itself.
|
||||
if (!filmstrip) requestAnimationFrame(() => document.getElementById(cardId(id))?.scrollIntoView({ block: "center", behavior: "smooth" }));
|
||||
};
|
||||
|
||||
const findField = useRef<HTMLDivElement>(null);
|
||||
const focusFind = () => findField.current?.querySelector("input")?.focus();
|
||||
// `/` focuses the field, deferred a frame so the key itself is not typed into it. A folded sidebar opens first.
|
||||
const findOnOpen = useRef(false);
|
||||
const openFind = () => {
|
||||
setFindOpen(true);
|
||||
requestAnimationFrame(focusFind);
|
||||
if (!sideCollapsed) {
|
||||
requestAnimationFrame(focusFind);
|
||||
return;
|
||||
}
|
||||
findOnOpen.current = true;
|
||||
setSideCollapsed(false);
|
||||
};
|
||||
useEffect(() => {
|
||||
if (sideCollapsed || !findOnOpen.current) return;
|
||||
findOnOpen.current = false;
|
||||
requestAnimationFrame(focusFind);
|
||||
}, [sideCollapsed]);
|
||||
const closeFind = () => {
|
||||
setQuery("");
|
||||
setFindOpen(false);
|
||||
// The field took the keyboard; hand it back to the page so its arrows work again.
|
||||
if (document.activeElement instanceof HTMLElement) document.activeElement.blur();
|
||||
};
|
||||
// `/` from another canvas lands here with the field open.
|
||||
// `/` from another canvas lands here with the field focused.
|
||||
useEffect(() => {
|
||||
if (props.findRequest === undefined) return;
|
||||
if (!props.phone) openFind();
|
||||
props.onFindRequestDone?.();
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps -- a new request opens it once
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps -- a new request focuses it once
|
||||
}, [props.findRequest]);
|
||||
const findButton = props.phone ? null : (
|
||||
<Tooltip label="Find a screen" shortcut={FIND_KEY} placement="bottom">
|
||||
<button type="button" className="screens-tree-find" aria-label="Find a screen" onClick={openFind}>
|
||||
<Search aria-hidden="true" />
|
||||
</button>
|
||||
</Tooltip>
|
||||
);
|
||||
const findSearch = findOpen ? (
|
||||
// The find field heads the tree on desktop.
|
||||
const findSearch = props.phone ? null : (
|
||||
<div ref={findField} className="screens-find">
|
||||
<PanelSearch
|
||||
value={query}
|
||||
placeholder="Find…"
|
||||
placeholder="Search"
|
||||
ariaLabel="Find screens"
|
||||
clearLabel="Clear find query"
|
||||
name="screens-find"
|
||||
autoFocus
|
||||
hint={<kbd className="screens-find-key" aria-hidden="true">{FIND_KEY}</kbd>}
|
||||
onEscape={() => (query ? setQuery("") : closeFind())}
|
||||
onChange={setQuery}
|
||||
/>
|
||||
</div>
|
||||
) : null;
|
||||
);
|
||||
const filterChips = changedIds.size > 0 ? (
|
||||
<div className="screens-filter" role="group" aria-label="Show">
|
||||
{(["changed", "all"] as const).map((value) => (
|
||||
@@ -424,6 +472,7 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
// A selection made elsewhere (search, the map, the Inspector) scrolls its card to the middle of
|
||||
// the page, as a pick in the tree does; a card already in view stays put.
|
||||
const scroller = useRef<HTMLElement>(null);
|
||||
const cardClick = useRef<{ id: string; at: number; x: number; y: number } | undefined>(undefined);
|
||||
const selected = props.selectedScreenId;
|
||||
const focusKey = props.focusRequest?.id === selected ? props.focusRequest?.key : undefined;
|
||||
const selectedShown = selected !== undefined && shown.has(selected);
|
||||
@@ -445,13 +494,13 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
setFoldedChanged(unfold);
|
||||
}, [selected, focusKey, shape]);
|
||||
useEffect(() => {
|
||||
if (!selected || !selectedShown) return;
|
||||
if (!selected || !selectedShown || filmstrip) return;
|
||||
const card = document.getElementById(cardId(selected));
|
||||
if (!card || !scroller.current) return;
|
||||
const bounds = card.getBoundingClientRect();
|
||||
const view = scroller.current.getBoundingClientRect();
|
||||
if (bounds.top < view.top || bounds.bottom > view.bottom) card.scrollIntoView({ block: "center", behavior: "smooth" });
|
||||
}, [selected, selectedShown, focusKey]);
|
||||
}, [selected, selectedShown, focusKey, filmstrip]);
|
||||
|
||||
// On desktop the arrow keys move through the cards: ← and → in their order on the page (`order`), as the arrows step
|
||||
// through screens in Compare, and ↑ and ↓ to the card above or below, by where the cards sit, so they follow the grid
|
||||
@@ -459,13 +508,17 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
// nothing picked, → and ↓ start at the first card, and a pick that Changed hides steps from where it sits in the tree.
|
||||
// The tree's rows keep their arrow keys, and so do the Inspector's controls. Phones are left as they were.
|
||||
// Held, an arrow keeps stepping as Compare's do (key-hold.ts). Return opens the picked screen in the Inspector, as a
|
||||
// click on its card does; on the card itself the button already does.
|
||||
// click on its card does; on the card itself the button already does. In the filmstrip, ← and → step from the screen
|
||||
// in the middle and Return opens it.
|
||||
const orderRef = useRef(order);
|
||||
orderRef.current = order;
|
||||
const treeOrderRef = useRef(treeOrder);
|
||||
treeOrderRef.current = treeOrder;
|
||||
const selectedRef = useRef(selected);
|
||||
selectedRef.current = selected;
|
||||
// In the filmstrip the arrows step from the screen in the middle, which is the pick once there is one.
|
||||
const stripFocusRef = useRef(stripFocus);
|
||||
stripFocusRef.current = stripFocus;
|
||||
const pickRef = useRef(props.onPickScreen ?? props.onSelectScreen);
|
||||
pickRef.current = props.onPickScreen ?? props.onSelectScreen;
|
||||
const openRef = useRef(props.onSelectScreen);
|
||||
@@ -479,6 +532,8 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
const ids = orderRef.current;
|
||||
const vertical = code === "ArrowUp" || code === "ArrowDown";
|
||||
const forward = code === "ArrowRight" || code === "ArrowDown";
|
||||
// The filmstrip is one row.
|
||||
if (vertical && stripFocusRef.current !== undefined) return undefined;
|
||||
if (from && ids.includes(from)) return vertical ? cardInNextRow(from, ids, forward) : ids[ids.indexOf(from) + (forward ? 1 : -1)];
|
||||
if (from && treeOrderRef.current.includes(from)) {
|
||||
// Picked, but hidden by Changed: the nearest shown card past it in the tree's order.
|
||||
@@ -491,7 +546,7 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
};
|
||||
const go = (id: string) => {
|
||||
pickRef.current(id);
|
||||
requestAnimationFrame(() => document.getElementById(cardId(id))?.querySelector<HTMLElement>(".screen-screenshot-target")?.focus({ preventScroll: true }));
|
||||
requestAnimationFrame(() => document.getElementById(cardId(id))?.querySelector<HTMLElement>(".screen-screenshot-target, .screens-strip-target")?.focus({ preventScroll: true }));
|
||||
};
|
||||
// A held arrow keeps stepping from the card the last step landed on, not the lagging pick.
|
||||
const hold = createKeyHold();
|
||||
@@ -520,13 +575,15 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
if (event.target instanceof Element && event.target.matches(".screens-find input")) {
|
||||
if (event.isComposing || event.metaKey || event.ctrlKey || event.altKey || event.shiftKey || event.code === "ArrowLeft" || event.code === "ArrowRight") return;
|
||||
const ids = orderRef.current;
|
||||
const picked = selectedRef.current && ids.includes(selectedRef.current) ? selectedRef.current : undefined;
|
||||
// In the filmstrip they step from the screen in the middle, as the page's arrows do.
|
||||
const picked = stripFocusRef.current ?? (selectedRef.current && ids.includes(selectedRef.current) ? selectedRef.current : undefined);
|
||||
const id = !arrow ? picked ?? ids[0] : next(event.code === "ArrowDown" ? "ArrowRight" : "ArrowLeft", picked);
|
||||
if (!id) return;
|
||||
event.preventDefault();
|
||||
if (!arrow) { openRef.current(id); return; }
|
||||
pickRef.current(id);
|
||||
requestAnimationFrame(() => document.getElementById(cardId(id))?.scrollIntoView({ block: "nearest" }));
|
||||
// The filmstrip brings the screen to its middle itself; scrolling its frame would move the page under it.
|
||||
if (stripFocusRef.current === undefined) requestAnimationFrame(() => document.getElementById(cardId(id))?.scrollIntoView({ block: "nearest" }));
|
||||
return;
|
||||
}
|
||||
// The browser's own repeat of a held arrow would scroll the page under the hold.
|
||||
@@ -535,17 +592,18 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
const target = event.target instanceof Element ? event.target : null;
|
||||
if (!arrow) {
|
||||
// Return on a button or a link presses it; elsewhere on the page it opens the pick.
|
||||
const selectedId = selectedRef.current;
|
||||
const selectedId = stripFocusRef.current ?? selectedRef.current;
|
||||
if (target?.closest("button, a, [role=\"button\"]") || !target?.closest("body") || !selectedId || !orderRef.current.includes(selectedId)) return;
|
||||
if (target !== document.body && !target.closest(".screens-page")) return;
|
||||
event.preventDefault();
|
||||
openRef.current(selectedId);
|
||||
return;
|
||||
}
|
||||
// The page, or the bottom toolbar that Screens was just opened from; its buttons have no arrow keys of their own.
|
||||
const onPage = !target || target === document.body || target.closest(".screens-page, .canvas-toolbar") !== null;
|
||||
// The page, or the bottom toolbar that Screens was just opened from, or the layout switch just used; their buttons
|
||||
// have no arrow keys of their own.
|
||||
const onPage = !target || target === document.body || target.closest(".screens-page, .canvas-toolbar, .screens-layout-switch") !== null;
|
||||
if (!onPage || target?.closest(".screens-tree-list")) return;
|
||||
const id = next(event.code, selectedRef.current);
|
||||
const id = next(event.code, stripFocusRef.current ?? selectedRef.current);
|
||||
if (!id) return;
|
||||
event.preventDefault();
|
||||
go(id);
|
||||
@@ -566,6 +624,28 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
};
|
||||
}, [props.phone]);
|
||||
|
||||
// A double-click on a card's screenshot opens that screen in the filmstrip. The first click selects it and opens the
|
||||
// Inspector, which narrows the grid and can slide over the card, so the second click may land on another card or on
|
||||
// the Inspector: the double-click is heard on the whole document, and the screen opened is the one the first click
|
||||
// picked. The route under a screenshot copies a link and is no click on the card.
|
||||
const openFilmstripRef = useRef<((id: string) => void) | undefined>(undefined);
|
||||
openFilmstripRef.current = !props.phone && !filmstrip && props.onChangeLayout ? (id: string) => {
|
||||
(props.onPickScreen ?? props.onSelectScreen)(id);
|
||||
props.onChangeLayout!("filmstrip");
|
||||
} : undefined;
|
||||
useEffect(() => {
|
||||
const onDoubleClick = (event: MouseEvent) => {
|
||||
const first = cardClick.current;
|
||||
// A double-click elsewhere, or later, is not this card's.
|
||||
if (!first || event.timeStamp - first.at > DOUBLE_CLICK_MS
|
||||
|| Math.hypot(event.clientX - first.x, event.clientY - first.y) > DOUBLE_CLICK_SLOP_PX) return;
|
||||
cardClick.current = undefined;
|
||||
openFilmstripRef.current?.(first.id);
|
||||
};
|
||||
document.addEventListener("dblclick", onDoubleClick);
|
||||
return () => document.removeEventListener("dblclick", onDoubleClick);
|
||||
}, []);
|
||||
|
||||
// The Inspector floats over the right edge; the page keeps its content clear of it.
|
||||
const { visibleFrame } = useCanvasVisibleFrame();
|
||||
const style = !props.phone && visibleFrame
|
||||
@@ -574,6 +654,30 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
|
||||
if (screens.length === 0) return <NoScreens map={props.map} />;
|
||||
|
||||
// Grid or Filmstrip, in words, at the top right where the Map keeps its camera: outside the page, so it stays put
|
||||
// as the grid scrolls, and clear of the Inspector.
|
||||
// A canvas narrowed by the Inspector keeps the switch's icons only, clear of the pill; one too narrow for even those
|
||||
// hides it, as the Map's camera hides (camera-controls.tsx). Esc, a double-click and closing the Inspector remain.
|
||||
const frameWidth = visibleFrame?.width ?? Infinity;
|
||||
const layoutSwitch = !props.phone && props.onChangeLayout && frameWidth >= SWITCH_MINIMUM_FRAME_WIDTH ? (
|
||||
<div className={`screens-layout-switch${frameWidth < SWITCH_LABELLED_FRAME_WIDTH ? " compact" : ""}`} role="group" aria-label="Screens layout"
|
||||
style={visibleFrame ? ({ "--screens-switch-right": `calc(100% - ${visibleFrame.x + visibleFrame.width}px)` } as CSSProperties) : undefined}>
|
||||
{([
|
||||
["grid", "Grid", <LayoutGrid key="grid" aria-hidden="true" />, SHORTCUTS.screens.grid],
|
||||
["filmstrip", "Filmstrip", <GalleryHorizontal key="filmstrip" aria-hidden="true" />, SHORTCUTS.screens.filmstrip],
|
||||
] as const)
|
||||
.map(([value, label, icon, shortcut]) => (
|
||||
<Tooltip key={value} label={label} shortcut={formatShortcut(shortcut)} placement="bottom">
|
||||
<button type="button" aria-label={label} aria-pressed={(filmstrip ? "filmstrip" : "grid") === value}
|
||||
onClick={() => props.onChangeLayout!(value)}>
|
||||
{icon}<span aria-hidden="true">{label}</span>
|
||||
</button>
|
||||
</Tooltip>
|
||||
))}
|
||||
</div>
|
||||
) : null;
|
||||
|
||||
const dimmed = (id: string) => Boolean(props.focus?.length) && !props.focus!.some((state) => state === focusStatusOf(props.diff?.screens.get(id)));
|
||||
const cell = (id: string) => {
|
||||
const screen = props.index.screens.get(id);
|
||||
return screen ? (
|
||||
@@ -583,8 +687,14 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
typicalSize={typicalSize}
|
||||
phone={props.phone}
|
||||
selected={props.selectedScreenId === id}
|
||||
dimmed={Boolean(props.focus?.length) && !props.focus!.some((state) => state === focusStatusOf(props.diff?.screens.get(id)))}
|
||||
onSelect={() => props.onSelectScreen(id)} />
|
||||
dimmed={dimmed(id)}
|
||||
onSelect={(event) => {
|
||||
// The second click of a double-click selects nothing: it may land on another card the first click's Inspector
|
||||
// moved under the pointer. The first click is kept with its place, for the double-click that follows.
|
||||
if (event.detail >= 2) return;
|
||||
cardClick.current = { id, at: event.timeStamp, x: event.clientX, y: event.clientY };
|
||||
props.onSelectScreen(id);
|
||||
}} />
|
||||
) : null;
|
||||
};
|
||||
|
||||
@@ -601,9 +711,12 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
);
|
||||
|
||||
return (
|
||||
<main ref={scroller} className={`screens-page${props.phone ? " phone" : ""}`} aria-label="Screens" style={style}
|
||||
<>
|
||||
{layoutSwitch}
|
||||
<main ref={scroller} className={`screens-page${props.phone ? " phone" : ""}${filmstrip ? " filmstrip" : ""}`} aria-label="Screens" style={style}
|
||||
onClick={(event) => {
|
||||
if (!props.onClearSelection || !props.selectedScreenId) return;
|
||||
// The filmstrip always shows a screen; clearing the pick there would only jump it back to the first.
|
||||
if (!props.onClearSelection || !props.selectedScreenId || filmstrip) return;
|
||||
if ((event.target as Element).closest("button, a, input, .screens-cell, .screens-side")) return;
|
||||
props.onClearSelection();
|
||||
}}>
|
||||
@@ -632,12 +745,29 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
) : null}
|
||||
|
||||
<div className="screens-body">
|
||||
{props.phone ? null : (
|
||||
{props.phone ? null : sideCollapsed ? (
|
||||
<aside className="screens-side collapsed">
|
||||
<button type="button" className={`screens-side-toggle${inChanged ? " narrowed" : ""}`} aria-expanded={false}
|
||||
aria-label={inChanged ? "Show sidebar, showing changed screens only" : "Show sidebar"}
|
||||
title={inChanged ? "Show sidebar · Changed only" : "Show sidebar"}
|
||||
onClick={() => toggleSide(false)}>
|
||||
<PanelLeftOpen aria-hidden="true" />
|
||||
</button>
|
||||
</aside>
|
||||
) : (
|
||||
<aside className="screens-side">
|
||||
<nav className="screens-tree" aria-label={tree.mode === "source" ? "Route files" : "Navigation"}>
|
||||
{findSearch ? <div className="screens-tree-head searching">{findSearch}</div>
|
||||
: filterChips || foldAll || findButton ? <div className="screens-tree-head">{filterChips}{findButton}{foldAll}</div> : null}
|
||||
<h2>{tree.mode === "source" ? "app/" : "Explored app"}</h2>
|
||||
{/* The find field heads the tree with fold-all and the sidebar's own fold beside it, so a report without
|
||||
changes has no empty row; Changed / All follows under it, the whole width, when there are changes. */}
|
||||
<div className="screens-tree-head">
|
||||
{findSearch}{foldAll}
|
||||
{/* Folding the sidebar away clears its find, which would otherwise narrow the screens out of sight. */}
|
||||
<button type="button" className="screens-side-toggle" aria-label="Hide sidebar" title="Hide sidebar" aria-expanded
|
||||
onClick={() => { setQuery(""); toggleSide(true); }}>
|
||||
<PanelLeftClose aria-hidden="true" />
|
||||
</button>
|
||||
</div>
|
||||
{filterChips}
|
||||
{matches && order.length === 0
|
||||
? <p className="screens-find-empty" role="status">{noMatch}</p>
|
||||
: treeRows}
|
||||
@@ -664,6 +794,13 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
<button type="button" className="screens-empty-all" onPointerDown={(event) => event.preventDefault()}
|
||||
onClick={() => { setFilter("all"); focusFind(); }}>Show all</button></p>
|
||||
: <p>Try part of a route, or press Esc to show every {inChanged ? "changed " : ""}screen.</p>}</div>
|
||||
: stripFocus ? (
|
||||
<ScreensFilmstrip order={order} focusedId={stripFocus} selectedId={props.selectedScreenId}
|
||||
index={props.index} diff={props.diff} tree={tree} shape={shape}
|
||||
typicalSize={typicalSize} frameId={cardId} dimmed={dimmed}
|
||||
dot={(id) => dotClass(props.diff, props.changedElsewhere, id)}
|
||||
onPick={props.onPickScreen ?? props.onSelectScreen} onOpen={props.onSelectScreen} />
|
||||
)
|
||||
: <div className="screens-grid">{order.map(cell)}</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -678,5 +815,6 @@ export function ScreensView(props: ScreensViewProps) {
|
||||
</PhoneSheet>
|
||||
) : null}
|
||||
</main>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -14,6 +14,8 @@ export type FocusStatus = "added" | "modified" | "accessibility-only" | "removed
|
||||
export type InspectView = "session" | "diff";
|
||||
/** Which way the inspector's transition list reads: into the screen, or out of it. */
|
||||
export type TransitionDirection = "in" | "out";
|
||||
/** How Screens lays out its screens: every card in a grid, or one at a time in a filmstrip. */
|
||||
export type ScreensLayout = "grid" | "filmstrip";
|
||||
|
||||
export type Route = {
|
||||
canvas: CanvasView;
|
||||
@@ -35,6 +37,8 @@ export type Route = {
|
||||
focus: FocusStatus[];
|
||||
/** Progressive Map groups the reader explicitly expanded, in stable URL order. */
|
||||
expandedGroups: string[];
|
||||
/** Screens' layout; unset is the grid. Only Screens has one. */
|
||||
layout?: ScreensLayout | undefined;
|
||||
};
|
||||
|
||||
/** What the grammar needs from the app: which baselines exist, and which screens record a route. */
|
||||
@@ -218,11 +222,12 @@ export function canonicalRoute(route: Route, ctx: RouteContext): Route {
|
||||
baseline,
|
||||
focus: compared ? FOCUSES.filter((status) => route.focus.includes(status)) : [],
|
||||
expandedGroups,
|
||||
...(canvas === "screens" && route.layout === "filmstrip" ? { layout: "filmstrip" as const } : {}),
|
||||
};
|
||||
}
|
||||
|
||||
/** The query parameters that mean the same in another target's report of the run. */
|
||||
const PLACE_PARAMS = ["inspect", "dir", "focus"] as const;
|
||||
const PLACE_PARAMS = ["inspect", "dir", "focus", "layout"] as const;
|
||||
|
||||
/**
|
||||
* Where the reader is, as another target's report reads it: the canvas and the screen's route (which resolves to that
|
||||
@@ -291,6 +296,7 @@ export function parseLocation(location: LocationLike, ctx: RouteContext): Route
|
||||
baseline: baseline === null ? ctx.defaultBaseline : baseline === "none" ? "" : baseline,
|
||||
focus,
|
||||
expandedGroups: legacyGraph ? [] : params.getAll("expand"),
|
||||
...(params.get("layout") === "filmstrip" ? { layout: "filmstrip" as const } : {}),
|
||||
}, ctx);
|
||||
}
|
||||
|
||||
@@ -319,6 +325,7 @@ export function formatRoute(route: Route, ctx: RouteContext): string {
|
||||
params.set("baseline", next.baseline === "" ? "none" : next.baseline);
|
||||
}
|
||||
if (next.focus.length > 0) params.set("focus", next.focus.join(","));
|
||||
if (next.layout) params.set("layout", next.layout);
|
||||
|
||||
const search = params.toString().replace(/%2C/gi, ",");
|
||||
return `/${next.canvas}${suffix}${search ? `?${search}` : ""}`;
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import type { ScreensLayout } from "./navigation";
|
||||
|
||||
function storageKey(runId: string): string {
|
||||
return `explore:screens-layout:${runId}`;
|
||||
}
|
||||
|
||||
/** The layout Screens last showed for a report, so opening Screens again shows it; unavailable storage remembers nothing. */
|
||||
export function readScreensLayout(runId: string | undefined): ScreensLayout | undefined {
|
||||
if (!runId) return undefined;
|
||||
try {
|
||||
return localStorage.getItem(storageKey(runId)) === "filmstrip" ? "filmstrip" : undefined;
|
||||
} catch { return undefined; }
|
||||
}
|
||||
|
||||
export function writeScreensLayout(runId: string | undefined, layout: ScreensLayout): void {
|
||||
if (!runId) return;
|
||||
try {
|
||||
if (layout === "filmstrip") localStorage.setItem(storageKey(runId), layout);
|
||||
else localStorage.removeItem(storageKey(runId));
|
||||
} catch { /* The layout lasts for this visit only. */ }
|
||||
}
|
||||
@@ -116,6 +116,11 @@ export const SHORTCUTS = {
|
||||
screens: ctrl("Digit2", "2"),
|
||||
compare: ctrl("Digit3", "3"),
|
||||
},
|
||||
/** Screens only, on desktop: G for the grid and E for the filmstrip, as Lightroom's Library switches Grid and Loupe. */
|
||||
screens: {
|
||||
grid: plain("KeyG", "G"),
|
||||
filmstrip: plain("KeyE", "E"),
|
||||
},
|
||||
/** Compare only. The arrows walk changed screens; J and K walk the changed areas of one. */
|
||||
compare: {
|
||||
previousScreen: plain("ArrowLeft", "←"),
|
||||
|
||||
Reference in new issue
Block a user