mirror of
https://github.com/expo/explore.git
synced 2026-11-15 13:18:16 -10:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4a64b721e3 | ||
|
|
6c3cec73fa |
No files matched your search
@@ -67,12 +67,9 @@ jobs:
|
||||
shell: bash
|
||||
env:
|
||||
COMMENT_ID: ${{ steps.comment.outputs.id }}
|
||||
# How long an alias can keep serving the previous push: an EAS Hosting edge that served it keeps it for about
|
||||
# five minutes (FIXTURE_ALIAS_WAIT_MS in src/report/preview-deploy.ts).
|
||||
ALIAS_CATCH_UP: 5 minutes
|
||||
run: |
|
||||
set -euo pipefail
|
||||
jq -r --arg marker "$MARKER" --arg sha "${SHA:0:7}" --arg run "$RUN_URL" --arg catchup "$ALIAS_CATCH_UP" '
|
||||
jq -r --arg marker "$MARKER" --arg sha "${SHA:0:7}" --arg run "$RUN_URL" '
|
||||
.previewUrl as $url
|
||||
| ([.reports[] | select(.platform == "android")] + [.reports[] | select(.platform != "android")]) as $reports
|
||||
| ($reports[0].source // "") as $source
|
||||
@@ -88,8 +85,6 @@ jobs:
|
||||
| ((.label // (if .platform == "ios" then "iOS" else "Android" end)) | gsub("\\|"; "\\\\|")) as $name
|
||||
| "| \($name)\(if .device then " · \(.device)" else "" end) | \(.changes // "–") | [Map](\($url)?\($query)) · [Screens](\($url)?\($query)#/screens) · [Compare](\($url)?\($query)&view=compare) |"),
|
||||
"",
|
||||
# The alias still served the previous push when the deploy stopped waiting for it: say so, and link the new deployment.
|
||||
(if .aliasBehind then "> **Going live:** this link can take up to \($catchup) to show \($sha); until then it shows the previous push, or nothing on a new pull request. [This push'"'"'s deployment](\(.deploymentUrl)/p/\($url | split("/p/")[1])) is live now.\n" else empty end),
|
||||
"The link stays the same on every push. [Deploy run](\($run))"]
|
||||
| join("\n")' "$RUNNER_TEMP/preview.json" > "$RUNNER_TEMP/comment.md"
|
||||
if [[ -n "$COMMENT_ID" ]]; then
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@expo/explore",
|
||||
"version": "0.20.1",
|
||||
"version": "0.20.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@expo/explore",
|
||||
"version": "0.20.1",
|
||||
"version": "0.20.0",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@expo/repack-app": "0.10.1",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@expo/explore",
|
||||
"version": "0.20.1",
|
||||
"version": "0.20.0",
|
||||
"description": "Source-driven mobile app maps, deterministic CI capture, and visual reviews",
|
||||
"license": "MIT",
|
||||
"type": "module",
|
||||
|
||||
@@ -435,9 +435,7 @@ async function writeCompareSummary(environment: NodeJS.ProcessEnv, comparison: C
|
||||
}
|
||||
|
||||
type HostedReportInput = { zip: Uint8Array; sha256: string; file: string; query: string };
|
||||
export type HostedDeployment = { previewUrl: string; expiresAt: string | null; deploymentId: string; deploymentUrl: string; aliasUrl?: string;
|
||||
/** The link is the alias, which still served an earlier deployment when the wait for it ran out. */
|
||||
aliasBehind?: true; project: string; owner: string };
|
||||
export type HostedDeployment = { previewUrl: string; expiresAt: string | null; deploymentId: string; deploymentUrl: string; aliasUrl?: string; project: string; owner: string };
|
||||
|
||||
/** EAS Hosting alias names: lowercase slugs, as `eas deploy --alias` normalises them. */
|
||||
export const HOSTING_ALIAS = /^[a-z0-9][a-z0-9-]{0,38}[a-z0-9]$/;
|
||||
@@ -497,13 +495,6 @@ async function deployReports(options: {
|
||||
alias?: string;
|
||||
/** A caller-chosen `/p/<token>`; with `alias`, the hosted link is identical from one run to the next. */
|
||||
token?: string;
|
||||
/** How long the alias has to serve this deployment once the deployment does; `verifyTimeoutMs` by default. */
|
||||
aliasWaitMs?: number;
|
||||
/**
|
||||
* Link the alias even when it still serves an earlier deployment after `aliasWaitMs`, for a link whose readers are
|
||||
* told it can lag, rather than the deployment's own host.
|
||||
*/
|
||||
linkBehindAlias?: boolean;
|
||||
sleep?: (milliseconds: number) => Promise<void>;
|
||||
}): Promise<HostedDeployment> {
|
||||
const { reports, project, environment, run, transport, now, random } = options;
|
||||
@@ -580,8 +571,7 @@ async function deployReports(options: {
|
||||
throw deployError("PREVIEW_DEPLOY_FAILED", `EAS Hosting deployed ${deploymentUrl.origin} but did not report the alias ${options.alias}.`,
|
||||
"Check the deployment's aliases in the EAS Hosting dashboard and rerun.", { retryable: true, details: { project, owner, alias: options.alias } });
|
||||
}
|
||||
const verify = (origin: string, alias = false) => verifyDeployment({ origin, token, transport, now, alias,
|
||||
timeoutMs: alias ? options.aliasWaitMs ?? options.verifyTimeoutMs : options.verifyTimeoutMs,
|
||||
const verify = (origin: string, alias = false) => verifyDeployment({ origin, token, transport, now, timeoutMs: options.verifyTimeoutMs, alias,
|
||||
reports: reports.map((report, index) => ({ query: report.query, ...written[index]! })),
|
||||
...(listing ? { listing: JSON.stringify(listing.map(({ path: _path, ...rest }) => rest)) } : {}) });
|
||||
const seconds = (milliseconds: number) => `${Math.round(milliseconds / 1000)} s after eas deploy returned`;
|
||||
@@ -591,9 +581,7 @@ async function deployReports(options: {
|
||||
// taken longer than the whole budget (every verification failure of 2026-10-14 was the alias, with the deployment
|
||||
// serving in 1 s). The deployment is verified and immutable, so when the alias is still behind the pull request
|
||||
// links the deployment instead of failing the job; the alias catches up on its own and the next push relinks it.
|
||||
// With `linkBehindAlias` it links the alias anyway, and its readers are told the link can lag.
|
||||
let linkOrigin = deploymentUrl.origin;
|
||||
let aliasBehind = false;
|
||||
if (aliasUrl) {
|
||||
try {
|
||||
const alias = await verify(aliasUrl.origin, true);
|
||||
@@ -601,16 +589,12 @@ async function deployReports(options: {
|
||||
linkOrigin = aliasUrl.origin;
|
||||
} catch (error) {
|
||||
if ((error as { code?: string }).code !== "PREVIEW_ALIAS_BEHIND") throw error;
|
||||
aliasBehind = Boolean(options.linkBehindAlias);
|
||||
if (aliasBehind) linkOrigin = aliasUrl.origin;
|
||||
process.stderr.write(`::warning::${(error as Error).message} ${aliasBehind
|
||||
? `The pull request links it anyway, until it catches up, beside the deployment ${deploymentUrl.origin}.`
|
||||
: `The pull request links the deployment ${deploymentUrl.origin} instead.`}\n`);
|
||||
process.stderr.write(`::warning::${(error as Error).message} The pull request links the deployment ${deploymentUrl.origin} instead.\n`);
|
||||
}
|
||||
}
|
||||
const previewUrl = `${linkOrigin}/p/${token}`;
|
||||
return { previewUrl, expiresAt: null, deploymentId: deployment.identifier!, deploymentUrl: deploymentUrl.origin,
|
||||
...(aliasUrl ? { aliasUrl: aliasUrl.origin } : {}), ...(aliasBehind ? { aliasBehind: true as const } : {}), project, owner };
|
||||
...(aliasUrl ? { aliasUrl: aliasUrl.origin } : {}), project, owner };
|
||||
} finally {
|
||||
await rm(work, { recursive: true, force: true });
|
||||
}
|
||||
@@ -684,20 +668,8 @@ export type FixturePreviewOptions = {
|
||||
random?: (bytes: number) => Uint8Array;
|
||||
onSecret?: (secret: string) => void;
|
||||
verifyTimeoutMs?: number;
|
||||
/** How long the alias has to serve the new deployment before the link is the alias anyway; FIXTURE_ALIAS_WAIT_MS by default. */
|
||||
aliasWaitMs?: number;
|
||||
};
|
||||
|
||||
/**
|
||||
* How long a fixture preview waits for its alias. An edge of EAS Hosting that served an alias keeps serving the
|
||||
* deployment it named for about five minutes (307–314 s, measured 2026-10-19 redeploying back to back from one machine),
|
||||
* so a deploy whose check reaches an edge that served the alias in the last five minutes, to the previous deploy's check
|
||||
* or to a reviewer, finds it behind; otherwise it has moved within seconds. Waiting the whole verification budget for
|
||||
* that held a third of the pull requests' deploy jobs for three minutes, only to link the deployment instead. The pull
|
||||
* request's comment says when the alias is behind.
|
||||
*/
|
||||
export const FIXTURE_ALIAS_WAIT_MS = 20_000;
|
||||
|
||||
/**
|
||||
* Host fixed reports behind a fixed alias with this checkout's Viewer: the Explore repository's own pull requests
|
||||
* preview their Viewer changes on real data. No GitHub token, no expiry; each run replaces what the alias serves.
|
||||
@@ -725,7 +697,6 @@ export async function deployFixturePreview(options: FixturePreviewOptions): Prom
|
||||
projectHint: "Give EXPO_TOKEN's account permission to create projects, or pass --project with an existing slug.",
|
||||
exportPath, environment, run: options.run ?? defaultRun, ...(options.sleep ? { sleep: options.sleep } : {}), transport: options.transport ?? fetch, now: options.now ?? Date.now, random,
|
||||
...(options.onSecret ? { onSecret: options.onSecret } : {}), verifyTimeoutMs: options.verifyTimeoutMs ?? 180_000, alias: options.alias,
|
||||
aliasWaitMs: options.aliasWaitMs ?? FIXTURE_ALIAS_WAIT_MS, linkBehindAlias: true,
|
||||
...(options.token ? { token: options.token } : {}) });
|
||||
}
|
||||
|
||||
|
||||
@@ -196,7 +196,7 @@ test("the pill shows the app's own icon when the report has one, and the Expo ma
|
||||
report.review.runtime.appIcon = { url: `https://artifact.expo-explore.invalid/${iconSha}.png`, sha256: iconSha, width: 4, height: 4 };
|
||||
report.assets.push({ sha256: iconSha, path: iconPath });
|
||||
const withIcon = await harness(t, await archive(report, [{ name: iconPath, bytes: iconBytes }]), { app: true });
|
||||
const logo = withIcon.page.locator(".left-panel-collapsed-pill").getByRole("button", { name: "Map of Fixture", exact: true });
|
||||
const logo = withIcon.page.locator(".left-panel-collapsed-pill").getByRole("button", { name: "Map", exact: true });
|
||||
await expect(logo.locator("img.panel-app-icon")).toHaveJSProperty("naturalWidth", 4);
|
||||
await expect(logo.locator(".expo-mark")).toHaveCount(0);
|
||||
// The tab shows it too, from a Blob URL: the ZIP's own reference is not one the browser can load.
|
||||
@@ -206,7 +206,7 @@ test("the pill shows the app's own icon when the report has one, and the Expo ma
|
||||
assert.deepEqual(withIcon.errors, []);
|
||||
|
||||
const withoutIcon = await harness(t, await archive(), { app: true });
|
||||
const mark = withoutIcon.page.locator(".left-panel-collapsed-pill").getByRole("button", { name: "Map of Fixture", exact: true });
|
||||
const mark = withoutIcon.page.locator(".left-panel-collapsed-pill").getByRole("button", { name: "Map", exact: true });
|
||||
await expect(mark.locator(".expo-mark")).toHaveCount(1);
|
||||
await expect(mark.locator("img")).toHaveCount(0);
|
||||
assert.deepEqual(withoutIcon.errors, []);
|
||||
@@ -647,259 +647,6 @@ test("a switch to a target whose screenshots have another shape lays the map out
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
/**
|
||||
* The phone header as drawn, once a resize's fit has run. Its shown controls, each of the row's clipped at the row's
|
||||
* edges: how many pairs overlap, how many run past the row's end (past the window on a desktop, whose row does not
|
||||
* clip), and the page's overflow; the target label's parts cut without a fade or faded though whole; the room around
|
||||
* the row's first and last controls for a focus ring; and the name's width against its text's and its minimum.
|
||||
*/
|
||||
function phoneHeader(page) {
|
||||
return page.locator(".left-panel-collapsed-pill").evaluate(async pill => {
|
||||
await new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)));
|
||||
const row = pill.querySelector(".collapsed-app-identity");
|
||||
const clip = row.getBoundingClientRect();
|
||||
const end = getComputedStyle(row).overflowX === "clip" ? clip.right - parseFloat(getComputedStyle(row).paddingRight) : innerWidth;
|
||||
const shown = [...pill.querySelectorAll(".panel-logo-button, .collapsed-app-identity > strong, .collapsed-platform, .collapsed-pr, .collapsed-search")]
|
||||
.filter(node => node.checkVisibility({ visibilityProperty: true }));
|
||||
const boxes = shown.map(node => {
|
||||
const box = node.getBoundingClientRect();
|
||||
return row.contains(node) ? { left: Math.max(box.left, clip.left), right: Math.min(box.right, clip.right) } : box;
|
||||
});
|
||||
let overlaps = 0;
|
||||
for (const [index, a] of boxes.entries()) for (const b of boxes.slice(index + 1)) if (a.left < b.right - 1 && b.left < a.right - 1) overlaps += 1;
|
||||
const items = shown.filter(node => row.contains(node));
|
||||
const past = items.filter(node => node.getBoundingClientRect().right > end + 1).length;
|
||||
const parts = [...row.querySelectorAll(".collapsed-target .collapsed-platform-label, .collapsed-target .collapsed-platform-label-text, .collapsed-target .collapsed-platform-label-suffix")];
|
||||
const cut = node => node.scrollWidth > node.offsetWidth;
|
||||
const faded = node => getComputedStyle(node).maskImage !== "none";
|
||||
const controls = items.filter(node => node.matches(".collapsed-platform, .collapsed-pr"));
|
||||
const ring = controls.length ? Math.floor(Math.min(controls[0].getBoundingClientRect().left - clip.left, clip.right - controls.at(-1).getBoundingClientRect().right)) : 4;
|
||||
const name = row.querySelector(":scope > strong");
|
||||
const minimum = parseFloat(getComputedStyle(row).getPropertyValue("--collapsed-name-min")) || 64;
|
||||
return {
|
||||
overlaps, past, overflow: document.documentElement.scrollWidth - innerWidth,
|
||||
unfaded: parts.filter(node => cut(node) && !faded(node)).length, fadedWhole: parts.filter(node => faded(node) && !cut(node)).length,
|
||||
ring, targetCut: parts.some(cut),
|
||||
name: name.checkVisibility({ visibilityProperty: true }) ? { width: name.getBoundingClientRect().width, text: name.scrollWidth, minimum: Math.min(minimum, name.scrollWidth) } : undefined,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
/** What a header that fits shows: nothing overlaps or runs past the row, and a label fades exactly where it is cut. */
|
||||
const FITS = { overlaps: 0, past: 0, overflow: 0, unfaded: 0, fadedWhole: 0 };
|
||||
const fitOf = ({ overlaps, past, overflow, unfaded, fadedWhole }) => ({ overlaps, past, overflow, unfaded, fadedWhole });
|
||||
|
||||
/**
|
||||
* A report of two targets, `label` the shown one's, for the phone header: `icon` adds the app's icon (`"broken"`, one
|
||||
* whose bytes are no image), `appearances` a second chip, and the pull request is #1234.
|
||||
*/
|
||||
async function phoneReport({ label, appName = "Acme Super Long Application Name", icon = false, appearances = false }) {
|
||||
const targets = [{ id: "shown", platform: "ios", label }, { id: "other", platform: "ios", label: "iPhone 17" }];
|
||||
const report = reportFixture();
|
||||
report.review.runtime = { ...report.review.runtime, appName, platform: "ios", platforms: ["ios"], target: targets[0], targets,
|
||||
...(appearances ? { colorSchemes: ["light", "dark"] } : {}) };
|
||||
report.review.pullRequest.number = 1234;
|
||||
const extra = [];
|
||||
if (icon) {
|
||||
const image = new PNG({ width: 4, height: 4 });
|
||||
image.data.fill(180);
|
||||
const bytes = icon === "broken" ? new TextEncoder().encode("not an image") : PNG.sync.write(image);
|
||||
const sha = createHash("sha256").update(bytes).digest("hex");
|
||||
report.review.runtime.appIcon = { url: `https://artifact.expo-explore.invalid/${sha}.png`, sha256: sha, width: 4, height: 4 };
|
||||
report.assets.push({ sha256: sha, path: `assets/${sha}.png` });
|
||||
extra.push({ name: `assets/${sha}.png`, bytes });
|
||||
}
|
||||
return archive(report, extra);
|
||||
}
|
||||
|
||||
test("at a phone's width the header leaves out the app's name, then the pull request link, then fades the target's device; nothing overlaps", { timeout: 60_000 }, async t => {
|
||||
const targets = [{ id: "iphone", platform: "ios", label: "iPhone 17" }, { id: "duo-half", platform: "ios", label: "iPhone 17 Pro Max Duo (half-open, outer)" }];
|
||||
const icon = new PNG({ width: 4, height: 4 });
|
||||
icon.data.fill(180);
|
||||
const iconBytes = PNG.sync.write(icon);
|
||||
const iconSha = createHash("sha256").update(iconBytes).digest("hex");
|
||||
const report = reportFixture();
|
||||
// An icon to name the app once its name is left out; two appearances for the second chip; the longest target.
|
||||
report.review.runtime = {
|
||||
...report.review.runtime, platform: "ios", platforms: ["ios"], target: targets[1], targets, colorSchemes: ["light", "dark"],
|
||||
appIcon: { url: `https://artifact.expo-explore.invalid/${iconSha}.png`, sha256: iconSha, width: 4, height: 4 },
|
||||
};
|
||||
report.assets.push({ sha256: iconSha, path: `assets/${iconSha}.png` });
|
||||
report.review.pullRequest.number = 1234;
|
||||
const { page, errors } = await harness(t, await archive(report, [{ name: `assets/${iconSha}.png`, bytes: iconBytes }]), { app: true });
|
||||
const pill = page.locator(".left-panel-collapsed-pill");
|
||||
const name = pill.locator(".collapsed-app-identity > strong");
|
||||
const target = pill.locator(".collapsed-target");
|
||||
const device = target.locator(".collapsed-platform-label-text");
|
||||
const pose = target.locator(".collapsed-platform-label-suffix");
|
||||
const pr = pill.locator(".collapsed-pr");
|
||||
const layout = async () => fitOf(await phoneHeader(page));
|
||||
const clipped = locator => locator.evaluate(node => node.scrollWidth - node.offsetWidth > 1);
|
||||
const whole = async () => ({ device: !await clipped(device), pose: !await clipped(pose) });
|
||||
const dropped = () => pill.locator(".collapsed-app-identity").evaluate(node => node.dataset.drop ?? "");
|
||||
// The fit measures text: the Viewer's font must be in before the row's widths mean anything.
|
||||
await page.evaluate(() => document.fonts.ready);
|
||||
|
||||
// A desktop window's pill is sized by its content and shows the whole row.
|
||||
await page.setViewportSize({ width: 1180, height: 820 });
|
||||
await expect(name).toBeVisible();
|
||||
await expect(target).toHaveText("iPhone 17 Pro Max Duo (half-open, outer)");
|
||||
await expect(pr).toHaveText("PR #1234");
|
||||
await expect(pr).toBeVisible();
|
||||
expect(await whole()).toEqual({ device: true, pose: true });
|
||||
expect(await dropped()).toBe("");
|
||||
await expect.poll(layout).toEqual(FITS);
|
||||
|
||||
// A small tablet has no room for the name beside Search: the row leaves it out (the icon still names the app) and
|
||||
// keeps the whole target and a shorter link.
|
||||
await page.setViewportSize({ width: 560, height: 932 });
|
||||
await expect(name).toBeHidden();
|
||||
await expect(pr).toHaveText("#1234");
|
||||
await expect(pr).toBeVisible();
|
||||
await expect(target).toHaveText("iPhone 17 Pro Max Duo (half-open, outer)");
|
||||
expect(await whole()).toEqual({ device: true, pose: true });
|
||||
await expect.poll(layout).toEqual(FITS);
|
||||
const search = pill.getByRole("button", { name: "Search", exact: true });
|
||||
const finger = await search.boundingBox();
|
||||
assert.ok(finger.width >= 44 && finger.height >= 44, `Search is ${finger.width}×${finger.height}`);
|
||||
|
||||
// A large phone's width leaves out the link too (Search keeps "Open pull request") before it touches the target.
|
||||
await page.setViewportSize({ width: 500, height: 844 });
|
||||
await expect(pr).toBeHidden();
|
||||
await expect(target).toHaveText("iPhone 17 Pro Max Duo (half-open, outer)");
|
||||
expect(await whole()).toEqual({ device: true, pose: true });
|
||||
await expect.poll(layout).toEqual(FITS);
|
||||
await page.keyboard.press("ControlOrMeta+KeyK");
|
||||
const palette = page.getByRole("dialog", { name: "Search Explore" });
|
||||
await palette.getByRole("combobox", { name: "Search screens and commands" }).fill("pull request");
|
||||
await expect(palette.getByRole("option", { name: /^Open pull request #1234 on GitHub/ })).toBeVisible();
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(palette).toBeHidden();
|
||||
|
||||
// An iPhone's width fades the device's name; the pose stays whole and nothing overlaps.
|
||||
await page.setViewportSize({ width: 390, height: 844 });
|
||||
await expect(pill.locator(".collapsed-app-identity")).toHaveAttribute("data-drop", /squeeze/);
|
||||
await expect(pill.locator(".collapsed-app-identity")).not.toHaveAttribute("data-drop", /pose/);
|
||||
expect(await whole()).toEqual({ device: false, pose: true });
|
||||
await expect.poll(layout).toEqual(FITS);
|
||||
|
||||
// Narrower than the pose beside two chips: the pose fades too, inside its chip, never over the appearance chip.
|
||||
await page.setViewportSize({ width: 320, height: 568 });
|
||||
await expect(pill.locator(".collapsed-app-identity")).toHaveAttribute("data-drop", /pose/);
|
||||
await expect(pill.locator(".collapsed-platform").nth(1)).toHaveText("Light");
|
||||
await expect.poll(layout).toEqual(FITS);
|
||||
|
||||
// Widened again, the row takes everything back: the desktop's pill is sized by its content and leaves nothing out
|
||||
// (its own width rule ellipsizes the name beside so long a target; the fit does not touch it).
|
||||
await page.setViewportSize({ width: 1180, height: 820 });
|
||||
await expect(name).toHaveCSS("visibility", "visible");
|
||||
await expect(name).toHaveCSS("position", "static");
|
||||
await expect(pr).toHaveText("PR #1234");
|
||||
await expect(pr).toBeVisible();
|
||||
expect(await whole()).toEqual({ device: true, pose: true });
|
||||
expect(await dropped()).toBe("");
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test("a phone's row without the app's icon cuts the name down to its minimum before it squeezes the target, and fades a label only where it is cut", { timeout: 90_000 }, async t => {
|
||||
const { page, errors } = await harness(t, await phoneReport({ label: "iPhone 16 Pro (open)" }), { app: true });
|
||||
const row = page.locator(".left-panel-collapsed-pill .collapsed-app-identity");
|
||||
await expect(row.locator(".collapsed-target")).toHaveText("iPhone 16 Pro (open)");
|
||||
await page.evaluate(() => document.fonts.ready);
|
||||
|
||||
// An iPhone's width has room for the whole target beside a cut name: the name gives way, the target keeps its label.
|
||||
await page.setViewportSize({ width: 390, height: 844 });
|
||||
await expect(row).not.toHaveAttribute("data-drop", /squeeze/);
|
||||
const iphone = await phoneHeader(page);
|
||||
assert.equal(iphone.targetCut, false);
|
||||
assert.ok(iphone.name && iphone.name.width > iphone.name.minimum + 1 && iphone.name.width < iphone.name.text, `the name is ${JSON.stringify(iphone.name)}`);
|
||||
|
||||
// At every phone width, the target is cut only once the name is at its minimum, and only what is cut fades.
|
||||
for (const width of [320, 340, 360, 375, 390, 414, 430, 460, 480, 560, 700]) {
|
||||
await page.setViewportSize({ width, height: 844 });
|
||||
const header = await phoneHeader(page);
|
||||
assert.deepEqual(fitOf(header), FITS, `at ${width}px`);
|
||||
if (header.name) assert.ok(header.name.width >= header.name.minimum - 1, `at ${width}px the name is ${JSON.stringify(header.name)}`);
|
||||
if (header.targetCut && header.name) assert.ok(header.name.width <= header.name.minimum + 1, `at ${width}px the target is cut beside ${JSON.stringify(header.name)}`);
|
||||
}
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test("a phone's header with Hand off fits its row at an iPhone's widths, with or without the app's icon", { timeout: 120_000 }, async t => {
|
||||
// The hosted preview's header: Hand off sits before Search, so the row has less room than at /r.
|
||||
const reports = [
|
||||
{ label: "iPhone 16 Pro (open)", icon: false, appearances: true },
|
||||
{ label: "iPhone 16 Pro (open)", icon: true, appearances: true },
|
||||
{ label: "iOS", icon: false, appearances: true },
|
||||
];
|
||||
for (const [index, options] of reports.entries()) {
|
||||
const preview = { token: `${"qrstuvwxyz234567234567234567".slice(0, 28)}${"abcd".slice(index, index + 1)}bcd` };
|
||||
const { page, errors } = await harness(t, await phoneReport(options), { app: true, reportIdentity: null, preview, query: "" });
|
||||
const pill = page.locator(".left-panel-collapsed-pill");
|
||||
await expect(pill.locator(".collapsed-target")).toHaveText(options.label);
|
||||
await page.evaluate(() => document.fonts.ready);
|
||||
for (const width of [320, 360, 390, 430, 460]) {
|
||||
await page.setViewportSize({ width, height: 844 });
|
||||
await expect(pill.getByRole("button", { name: "Hand off to AI" })).toBeVisible();
|
||||
const header = await phoneHeader(page);
|
||||
const where = `${JSON.stringify(options)} at ${width}px`;
|
||||
assert.deepEqual(fitOf(header), FITS, where);
|
||||
// The row's end chip has room for its focus ring (2px, 2px out) and its key hint.
|
||||
assert.ok(header.ring >= 4, `${where}: ${header.ring}px around the row's controls`);
|
||||
// A name the row keeps is readable; one it leaves out is still the Map button's.
|
||||
if (header.name) assert.ok(header.name.width >= header.name.minimum - 1, `${where}: the name is ${JSON.stringify(header.name)}`);
|
||||
else await expect(pill.getByRole("button", { name: "Map of Acme Super Long Application Name", exact: true })).toBeVisible();
|
||||
// A short label is no squeeze's to give: it shows whole.
|
||||
if (options.label === "iOS") assert.equal(header.targetCut, false, where);
|
||||
}
|
||||
assert.deepEqual(errors, []);
|
||||
await page.close();
|
||||
}
|
||||
});
|
||||
|
||||
test("a phone's row keeps the app's name when its icon cannot be read and the Expo mark stands in", { timeout: 60_000 }, async t => {
|
||||
const { page, errors } = await harness(t, await phoneReport({ label: "iPhone 17 Pro Max Duo (half-open, outer)", icon: "broken", appearances: true }), { app: true });
|
||||
const pill = page.locator(".left-panel-collapsed-pill");
|
||||
await expect(pill.locator(".panel-logo-button .expo-mark")).toHaveCount(1);
|
||||
await expect(pill.locator(".panel-logo-button img")).toHaveCount(0);
|
||||
await page.evaluate(() => document.fonts.ready);
|
||||
// With the icon, this width leaves the name out; the Expo mark does not name the app, so the name stays, cut.
|
||||
await page.setViewportSize({ width: 560, height: 932 });
|
||||
await expect(pill.locator(".collapsed-app-identity > strong")).toBeVisible();
|
||||
const header = await phoneHeader(page);
|
||||
assert.deepEqual(fitOf(header), FITS);
|
||||
assert.ok(header.name && header.name.width >= header.name.minimum - 1, `the name is ${JSON.stringify(header.name)}`);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test("a phone's fit that waits on the fonts does nothing once the window is a desktop's", { timeout: 60_000 }, async t => {
|
||||
// The fonts arrive only when the test says, after the window has crossed to the desktop layout.
|
||||
const fault = () => {
|
||||
let release;
|
||||
const ready = new Promise(resolve => { release = () => resolve(document.fonts); });
|
||||
Object.defineProperty(document.fonts, "ready", { configurable: true, get: () => ready });
|
||||
window.releaseFonts = release;
|
||||
};
|
||||
const bytes = await phoneReport({ label: "iPhone 16 Pro (open)", icon: true, appearances: true });
|
||||
const { page, errors } = await harness(t, bytes, { app: true, open: false, fault });
|
||||
await page.setViewportSize({ width: 390, height: 844 });
|
||||
await chooseFile(page, bytes);
|
||||
const pill = page.locator(".left-panel-collapsed-pill");
|
||||
const row = pill.locator(".collapsed-app-identity");
|
||||
await expect(row).toHaveAttribute("data-drop", /name/);
|
||||
|
||||
await page.setViewportSize({ width: 1180, height: 820 });
|
||||
await expect(pill.locator(".collapsed-pr")).toHaveText("PR #1234");
|
||||
await page.evaluate(async () => {
|
||||
window.releaseFonts();
|
||||
await new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve)));
|
||||
});
|
||||
await expect(row).not.toHaveAttribute("data-drop");
|
||||
await expect(pill.locator(".collapsed-pr")).toBeVisible();
|
||||
await expect(pill.locator(".collapsed-app-identity > strong")).toBeVisible();
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test("a hosted manifest larger than the Viewer reads is refused before it is parsed", { timeout: 60_000 }, async t => {
|
||||
const preview = { token: "klmnopqrstuvwxyz2345672345672345", padding: 11 * 1024 * 1024 };
|
||||
const { page, errors } = await harness(t, await archive(), { app: true, reportIdentity: null, preview, query: "" });
|
||||
|
||||
@@ -1254,7 +1254,7 @@ test("does not send viewer cookies to a cross-origin static workspace", async ({
|
||||
|
||||
test("the logo returns to the Map root", async ({ page }) => {
|
||||
await page.goto("/screens?screen=settings-root");
|
||||
await page.locator(".left-panel-collapsed-pill").getByRole("button", { name: /^Map of / }).click();
|
||||
await page.locator(".left-panel-collapsed-pill").getByRole("button", { name: "Map", exact: true }).click();
|
||||
await expect(page).toHaveURL(/\/map$/);
|
||||
await expect(page.locator(".map-canvas")).toBeVisible();
|
||||
});
|
||||
@@ -2811,7 +2811,7 @@ test("floats the pill over the canvas and remembers the Inspector across a reloa
|
||||
expect(expandedCameraShadow).not.toBe("none");
|
||||
const collapsedPanel = page.locator(".left-panel.collapsed");
|
||||
await expect(collapsedPanel).toBeVisible();
|
||||
await expect(collapsedPanel.getByRole("button", { name: /^Map of / })).toBeVisible();
|
||||
await expect(collapsedPanel.getByRole("button", { name: "Map", exact: true })).toBeVisible();
|
||||
await expect(collapsedPanel.locator(".collapsed-app-identity strong")).toBeVisible();
|
||||
// There is no sidebar to open: the pill is the only left chrome.
|
||||
await expect(page.getByRole("button", { name: /^(Expand|Collapse) panel$/ })).toHaveCount(0);
|
||||
@@ -3076,7 +3076,7 @@ test("keeps fixed objects and canvas pan after a reload", async ({ page }) => {
|
||||
|
||||
test("delays the first tooltip, then shows subsequent tooltips instantly", async ({ page }) => {
|
||||
await page.goto("/map");
|
||||
const menu = page.locator(".left-panel-collapsed-pill").getByRole("button", { name: /^Map of / });
|
||||
const menu = page.locator(".left-panel-collapsed-pill").getByRole("button", { name: "Map", exact: true });
|
||||
const changes = page.getByRole("button", { name: "Fit canvas", exact: true });
|
||||
const tooltip = page.locator(".tooltip");
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import test from "node:test";
|
||||
import { prepareCaptureReview } from "../../dist/review/capture-review.js";
|
||||
import { createSourceCapturePlan } from "../../dist/source/capture-plan.js";
|
||||
import { writeCiReportInput, exportCiReport } from "../../dist/report/artifact.js";
|
||||
import { collectPlatformReports, deployExplorationReport, deployFixturePreview, deployLocalReports, FIXTURE_ALIAS_WAIT_MS, fixtureReports, deployPreview, previewProjectSlug, readReportZip, whoamiAccounts, zipReportDirectory } from "../../dist/report/preview-deploy.js";
|
||||
import { collectPlatformReports, deployExplorationReport, deployFixturePreview, deployLocalReports, fixtureReports, deployPreview, previewProjectSlug, readReportZip, whoamiAccounts, zipReportDirectory } from "../../dist/report/preview-deploy.js";
|
||||
import { spawnSync } from "node:child_process";
|
||||
import { ZipReader, Uint8ArrayReader, TextWriter, configure } from "@zip.js/zip.js";
|
||||
import { viewerLinks } from "../../dist/report/viewer-links.js";
|
||||
@@ -456,20 +456,6 @@ test("a standalone report deploys to a fixed alias with a fixed token, verifies
|
||||
assert.match(plain.previewUrl, /^https:\/\/acme-explore--1lcbdcpwn3\.expo\.app\/p\/[a-z2-7]{32}$/);
|
||||
assert.notEqual(plain.previewUrl, result.previewUrl, "without a fixed token the link is random");
|
||||
|
||||
// A standalone report's alias that is still behind after the whole budget: its link is the deployment, which
|
||||
// serves this run, and nothing says the alias is behind (only a fixture preview's comment explains a lagging link).
|
||||
const behind = easFixture({ aliasServes: false });
|
||||
let clock = now;
|
||||
const quiet = process.stderr.write.bind(process.stderr);
|
||||
process.stderr.write = () => true;
|
||||
let fallback;
|
||||
try {
|
||||
fallback = await deployExplorationReport({ reportPath, project: "acme-explore", owner: "brent-org", exportPath, alias: "bluesky", token,
|
||||
environment: deployEnvironment, transport: behind.transport, run: behind.run, now: () => (clock += 31_000), verifyTimeoutMs: 60_000 });
|
||||
} finally { process.stderr.write = quiet; }
|
||||
assert.equal(fallback.previewUrl, `https://acme-explore--1lcbdcpwn3.expo.app/p/${token}`);
|
||||
assert.equal(fallback.aliasBehind, undefined);
|
||||
|
||||
await assert.rejects(deployExplorationReport({ reportPath, project: "acme-explore", owner: "brent-org", exportPath, alias: "Blue Sky",
|
||||
environment: deployEnvironment, transport: eas.transport, run: eas.run, verifyTimeoutMs: 1 }), error => error.code === "PREVIEW_ALIAS_INVALID");
|
||||
await assert.rejects(deployExplorationReport({ reportPath, project: "acme-explore", owner: "brent-org", exportPath, token: "short",
|
||||
@@ -501,28 +487,21 @@ test("a fixture preview seals each platform's ZIP as is behind one alias and lis
|
||||
const served = eas.requests.filter(request => request.url.pathname === `/p/${token}/manifest.json`).map(request => request.url.searchParams.get("platform"));
|
||||
assert.deepEqual([...new Set(served)].sort(), ["android", "ios"], "both platforms' manifests are verified");
|
||||
|
||||
// The alias lagging the deployment is not a failed deployment (every 2026-10-14 "HTTP 404" failure was this): the
|
||||
// deployment is verified, so after FIXTURE_ALIAS_WAIT_MS, not the whole verification budget, the pull request links
|
||||
// the alias anyway, says it is behind, and the job log carries a warning.
|
||||
// The alias lagging the deployment past the budget is not a failed deployment: the deployment is verified, so the
|
||||
// link is the deployment's own origin and the job log carries a warning (every 2026-10-14 "HTTP 404" failure was this).
|
||||
const behind = easFixture({ aliasOrigin: "https://explore-viewer-pr--pr-12.expo.app", aliasServes: false });
|
||||
// Each poll really waits 3 s, so the clock moves 7 s a reading: the 20 s wait is three polls, not twenty.
|
||||
let clock = now; const ticking = () => (clock += 7_000);
|
||||
let clock = now; const ticking = () => (clock += 31_000);
|
||||
const quiet = process.stderr.write.bind(process.stderr); const logged = [];
|
||||
process.stderr.write = chunk => { logged.push(String(chunk)); return true; };
|
||||
let linked;
|
||||
try {
|
||||
linked = await deployFixturePreview({ reports: [{ platform: "ios", zipPath: join(root, "ios.zip") }], project: "explore-viewer-pr", owner: "brent-org", alias: "pr-12", token,
|
||||
exportPath, environment: deployEnvironment, transport: behind.transport, run: behind.run, now: ticking, verifyTimeoutMs: 180_000 });
|
||||
exportPath, environment: deployEnvironment, transport: behind.transport, run: behind.run, now: ticking, verifyTimeoutMs: 60_000 });
|
||||
} finally { process.stderr.write = quiet; }
|
||||
assert.equal(linked.previewUrl, `https://explore-viewer-pr--pr-12.expo.app/p/${token}`);
|
||||
assert.equal(linked.previewUrl, `https://acme-explore--1lcbdcpwn3.expo.app/p/${token}`);
|
||||
assert.equal(linked.aliasUrl, "https://explore-viewer-pr--pr-12.expo.app");
|
||||
assert.equal(linked.aliasBehind, true);
|
||||
assert.equal(linked.deploymentUrl, "https://acme-explore--1lcbdcpwn3.expo.app", "the comment links the verified deployment beside the alias");
|
||||
assert.equal(logged.filter(line => /^Deployment https:\/\/acme-explore--1lcbdcpwn3\.expo\.app serves this run's report \(\d+ s after eas deploy returned\)\./.test(line)).length, 1);
|
||||
const warning = logged.find(line => /^::warning::The alias https:\/\/explore-viewer-pr--pr-12\.expo\.app still answers HTTP 404 \d+ s after eas deploy returned\. The pull request links it anyway, until it catches up, beside the deployment https:\/\/acme-explore--1lcbdcpwn3\.expo\.app\./.test(line));
|
||||
assert.ok(warning, logged.join(""));
|
||||
const waited = Number(/HTTP 404 (\d+) s/.exec(warning)[1]);
|
||||
assert.ok(waited >= FIXTURE_ALIAS_WAIT_MS / 1000 && waited < FIXTURE_ALIAS_WAIT_MS / 1000 + 15, `gave up on the alias after ${waited} s, not the 180 s budget`);
|
||||
assert.equal(logged.filter(line => /^::warning::The alias https:\/\/explore-viewer-pr--pr-12\.expo\.app still answers HTTP 404 \d+ s after eas deploy returned\. The pull request links the deployment https:\/\/acme-explore--1lcbdcpwn3\.expo\.app instead\./.test(line)).length, 1);
|
||||
assert.ok(behind.requests.some(request => request.url.origin === "https://explore-viewer-pr--pr-12.expo.app"), "the alias was polled");
|
||||
|
||||
// The example report keeps one token and the same fixtures, so an alias still on the previous deployment serves the
|
||||
@@ -534,8 +513,7 @@ test("a fixture preview seals each platform's ZIP as is behind one alias and lis
|
||||
linked = await deployFixturePreview({ reports: [{ platform: "ios", zipPath: join(root, "ios.zip") }], project: "explore-viewer-pr", owner: "brent-org", alias: "pr-12", token,
|
||||
exportPath, environment: deployEnvironment, transport: stale.transport, run: stale.run, now: ticking, verifyTimeoutMs: 60_000 });
|
||||
} finally { process.stderr.write = quiet; }
|
||||
assert.equal(linked.previewUrl, `https://explore-viewer-pr--pr-12.expo.app/p/${token}`);
|
||||
assert.equal(linked.aliasBehind, true);
|
||||
assert.equal(linked.previewUrl, `https://acme-explore--1lcbdcpwn3.expo.app/p/${token}`);
|
||||
assert.equal(logged.filter(line => /^::warning::The alias https:\/\/explore-viewer-pr--pr-12\.expo\.app still serves an earlier deployment \d+ s after eas deploy returned\./.test(line)).length, 1);
|
||||
|
||||
await assert.rejects(deployFixturePreview({ reports: [{ platform: "ios", zipPath: join(root, "ios.zip") }, { platform: "ios", zipPath: join(root, "ios.zip") }],
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { appearanceLabel, type Appearance } from "../../utils/appearance";
|
||||
import { useEffect, useLayoutEffect, useRef, useState, useSyncExternalStore, type ReactNode } from "react";
|
||||
import { useEffect, useRef, useState, useSyncExternalStore, type ReactNode } from "react";
|
||||
import { LoaderCircle, Search } from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import { ExpoLogo } from "../shared/expo-logo";
|
||||
@@ -13,7 +13,6 @@ import { KeyHint } from "../shared/key-hint";
|
||||
import { formatShortcut, matchesShortcut, shortcutsLive, SHORTCUTS, TARGET_NUMBER_KEYS } from "../../utils/shortcuts";
|
||||
import { ChangesMenu } from "./changes-menu";
|
||||
import { placeForAnotherTarget, type FocusStatus } from "../../utils/navigation";
|
||||
import { usePhoneLayout } from "../../utils/phone-layout";
|
||||
import type { ExploreMap, MapIndex } from "../../utils/model";
|
||||
import type { BuildDiff } from "../../utils/build-diff";
|
||||
import type { PullRequestPresentation } from "../../utils/review-model";
|
||||
@@ -104,25 +103,6 @@ function useSiblingReports(page: URL | undefined): SiblingReport[] | undefined {
|
||||
return reports;
|
||||
}
|
||||
|
||||
/**
|
||||
* A chip's label, truncating from its end when the chip is squeezed, except a trailing parenthetical: a target's
|
||||
* pose, "iPhone Duo (open)", keeps "(open)" and loses letters of the device.
|
||||
*/
|
||||
function ChipLabel({ text }: { text: string }) {
|
||||
const suffix = /^(.*\S) (\(.+\))$/.exec(text);
|
||||
return (
|
||||
<span className="collapsed-platform-label">
|
||||
<span className="collapsed-platform-label-text">{suffix ? suffix[1] : text}</span>
|
||||
{suffix ? <span className="collapsed-platform-label-suffix">{` ${suffix[2]}`}</span> : null}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
/** Whether an element's text runs past its box: scrollWidth is an integer, so a sub-pixel overrun is no cut. */
|
||||
function cut(element: HTMLElement | null): boolean {
|
||||
return Boolean(element && element.scrollWidth > element.offsetWidth);
|
||||
}
|
||||
|
||||
type AppPillProps = {
|
||||
/** The phone layout puts Search in the pill, at its trailing edge. */
|
||||
onOpenSearch?: (() => void) | undefined;
|
||||
@@ -156,8 +136,6 @@ type AppPillProps = {
|
||||
export function AppPill(props: AppPillProps) {
|
||||
const pillRef = useRef<HTMLDivElement>(null);
|
||||
const platformRef = useRef<HTMLButtonElement>(null);
|
||||
const phone = usePhoneLayout();
|
||||
const identityRef = useRef<HTMLDivElement>(null);
|
||||
const [platformOpen, setPlatformOpen] = useState(false);
|
||||
// A target still downloading: this report stays up, the trigger and the menu row say so. One that failed says why.
|
||||
const { switching, switchError } = useSyncExternalStore(REPORT_SOURCE.subscribe, REPORT_SOURCE.getSnapshot, REPORT_SOURCE.getSnapshot);
|
||||
@@ -172,9 +150,6 @@ export function AppPill(props: AppPillProps) {
|
||||
const applicationName = props.map.run.name;
|
||||
// The app's own icon when the report carries one; the Expo mark otherwise.
|
||||
const appIcon = artifactUrl(props.map.run.appIcon);
|
||||
// An icon that cannot be read shows the Expo mark instead, which does not name the app: the icon it was for.
|
||||
const [failedIcon, setFailedIcon] = useState<string>();
|
||||
const iconShown = Boolean(appIcon) && failedIcon !== appIcon;
|
||||
const platform = props.map.run.platform;
|
||||
const environment = props.map.run.environment ?? {};
|
||||
const device = [
|
||||
@@ -195,72 +170,6 @@ export function AppPill(props: AppPillProps) {
|
||||
const run = runTargets(props.map.run);
|
||||
const currentTarget = run.targets.find(target => target.id === run.current);
|
||||
const targetLabel = currentTarget?.label ?? PLATFORM_NAMES[platform] ?? platform;
|
||||
|
||||
// The phone's header is the window's width. When the row cannot fit, it gives way in order: the app's name (left
|
||||
// out while the app's own icon names it, or else cut down to its minimum), then the pull request link (Search keeps
|
||||
// "Open pull request"); only then does the target's chip shrink, holding the name at its minimum: its device first,
|
||||
// its pose only once the device is gone, so the label never runs out of its chip over the next. A name without its
|
||||
// icon is left out last, when even the shrunk chip leaves it no room. Each step is laid out and measured in turn
|
||||
// from the first, so the result is a function of the row's width alone, never of the last result. A label fades at
|
||||
// its end only where it is cut. The desktop's pill is sized by its content, so it leaves nothing out.
|
||||
const appearanceCurrent = props.appearance?.current;
|
||||
useLayoutEffect(() => {
|
||||
const row = identityRef.current;
|
||||
if (!row) return;
|
||||
if (!phone) {
|
||||
delete row.dataset.drop;
|
||||
delete row.dataset.fade;
|
||||
return;
|
||||
}
|
||||
let disposed = false;
|
||||
const fit = () => {
|
||||
if (disposed) return;
|
||||
const name = row.querySelector<HTMLElement>(":scope > strong");
|
||||
const target = row.querySelector<HTMLElement>(".collapsed-target");
|
||||
const label = target?.querySelector<HTMLElement>(".collapsed-platform-label") ?? null;
|
||||
const device = target?.querySelector<HTMLElement>(".collapsed-platform-label-text") ?? null;
|
||||
const pose = target?.querySelector<HTMLElement>(".collapsed-platform-label-suffix") ?? null;
|
||||
const style = getComputedStyle(row);
|
||||
const minimum = parseFloat(style.getPropertyValue("--collapsed-name-min")) || 0;
|
||||
// A chip no wider than its squeezed minimum has nothing to give: squeezing it would only widen it.
|
||||
row.dataset.drop = "";
|
||||
const squeezable = Boolean(target && target.getBoundingClientRect().width > (parseFloat(style.getPropertyValue("--collapsed-target-min")) || 0));
|
||||
const steps = [
|
||||
...(name && iconShown ? ["name"] : []),
|
||||
...(row.querySelector(".collapsed-pr") ? ["pr"] : []),
|
||||
...(squeezable ? ["squeeze"] : []),
|
||||
...(squeezable && pose ? ["pose"] : []),
|
||||
...(name && !iconShown ? ["name"] : []),
|
||||
];
|
||||
// With `drops` left out, nothing runs past the row's end, a name that stays shows whole beside its icon and at
|
||||
// least its minimum without, and a squeezed label still shows its whole pose.
|
||||
const fits = (drops: string[]) => {
|
||||
row.dataset.drop = drops.join(" ");
|
||||
const end = row.getBoundingClientRect().right - parseFloat(style.paddingRight);
|
||||
if (Array.from(row.children).some(item => item.getBoundingClientRect().right > end + 0.5)) return false;
|
||||
if (name && !drops.includes("name") && !drops.includes("squeeze")) {
|
||||
if (iconShown ? cut(name) : name.getBoundingClientRect().width < Math.min(minimum, name.scrollWidth) - 0.5) return false;
|
||||
}
|
||||
return !drops.includes("squeeze") || drops.includes("pose") || !cut(label);
|
||||
};
|
||||
let count = 0;
|
||||
while (count < steps.length && !fits(steps.slice(0, count))) count += 1;
|
||||
if (count === steps.length) row.dataset.drop = steps.join(" ");
|
||||
if (!row.dataset.drop) delete row.dataset.drop;
|
||||
const fade = [...(cut(device) ? ["device"] : []), ...(cut(pose) ? ["pose"] : [])];
|
||||
if (fade.length) row.dataset.fade = fade.join(" ");
|
||||
else delete row.dataset.fade;
|
||||
};
|
||||
fit();
|
||||
// The row's room, and its items' widths: a font arriving after the first paint changes the latter alone.
|
||||
const observer = new ResizeObserver(fit);
|
||||
for (const node of [row, ...row.children]) observer.observe(node);
|
||||
void document.fonts.ready.then(fit);
|
||||
return () => {
|
||||
disposed = true;
|
||||
observer.disconnect();
|
||||
};
|
||||
}, [targetLabel, appearanceCurrent, pullRequest, phone, iconShown]);
|
||||
// Platform-named targets (every report from before targets) switch platforms; named targets switch devices.
|
||||
const noun = run.targets.every(target => target.id === target.platform) ? "platform" : "device";
|
||||
const siblings = run.targets
|
||||
@@ -332,17 +241,15 @@ export function AppPill(props: AppPillProps) {
|
||||
<div className="left-panel collapsed">
|
||||
<div ref={pillRef} className="left-panel-collapsed-pill">
|
||||
<Tooltip label="Map">
|
||||
{/* The button names the app as well: the icon has no text of its own, and a phone's row can leave the name out. */}
|
||||
<button type="button" className="panel-logo-button" aria-label={`Map of ${applicationName}`} onClick={props.onOpenMap}>
|
||||
<button type="button" className="panel-logo-button" aria-label="Map" onClick={props.onOpenMap}>
|
||||
{appIcon ? (
|
||||
<ScreenshotImage className="panel-app-icon" src={appIcon} alt="" loading="eager" draggable={false}
|
||||
fallback={<ExpoLogo mark />} holdPrevious onError={() => setFailedIcon(appIcon)} />
|
||||
fallback={<ExpoLogo mark />} holdPrevious />
|
||||
) : <ExpoLogo mark />}
|
||||
</button>
|
||||
</Tooltip>
|
||||
<span className="panel-logo-divider" aria-hidden="true" />
|
||||
{/* The phone's fit (above) sets data-drop and data-fade on the row itself. */}
|
||||
<div ref={identityRef} className="collapsed-app-identity">
|
||||
<div className="collapsed-app-identity">
|
||||
<strong title={appTitle}>
|
||||
{repositoryUrl ? (
|
||||
<a className="collapsed-app-name" href={repositoryUrl} target="_blank" rel="noreferrer noopener"
|
||||
@@ -354,11 +261,11 @@ export function AppPill(props: AppPillProps) {
|
||||
{siblings.length ? (
|
||||
<>
|
||||
<Tooltip label={`${device || targetLabel} · open another ${noun}'s report`} shortcut={formatShortcut(SHORTCUTS.target.menu)} placement="bottom">
|
||||
<button ref={platformRef} type="button" className="collapsed-platform collapsed-target" aria-haspopup="menu" aria-expanded={platformOpen}
|
||||
<button ref={platformRef} type="button" className="collapsed-platform" aria-haspopup="menu" aria-expanded={platformOpen}
|
||||
aria-label={`${noun === "device" ? "Device" : "Platform"}: ${targetLabel}. Open another ${noun}'s report`}
|
||||
aria-busy={switching ? true : undefined}
|
||||
onClick={() => setPlatformOpen(open => !open)}>
|
||||
<ChipLabel text={targetLabel} />
|
||||
{targetLabel}
|
||||
{switching
|
||||
? <LoaderCircle aria-hidden="true" className="collapsed-platform-busy" />
|
||||
: <svg aria-hidden="true" width="8" height="8" viewBox="0 0 8 8"><path d="M1 2.5 4 5.5 7 2.5" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" /></svg>}
|
||||
@@ -373,7 +280,7 @@ export function AppPill(props: AppPillProps) {
|
||||
<button ref={appearanceRef} type="button" className="collapsed-platform" aria-haspopup="menu" aria-expanded={appearanceOpen}
|
||||
aria-label={`Appearance: ${appearanceLabel(props.appearance.current)}. Show the other appearance`}
|
||||
onClick={() => setAppearanceOpen(open => !open)}>
|
||||
<ChipLabel text={appearanceLabel(props.appearance.current)} />
|
||||
{appearanceLabel(props.appearance.current)}
|
||||
<svg aria-hidden="true" width="8" height="8" viewBox="0 0 8 8"><path d="M1 2.5 4 5.5 7 2.5" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round" /></svg>
|
||||
<KeyHint shortcut={SHORTCUTS.appearance.app} />
|
||||
</button>
|
||||
@@ -400,7 +307,7 @@ export function AppPill(props: AppPillProps) {
|
||||
target="_blank"
|
||||
rel="noreferrer noopener"
|
||||
aria-label={`PR #${pullRequest.number} on GitHub`}>
|
||||
{phone ? `#${pullRequest.number}` : `PR #${pullRequest.number}`}
|
||||
PR #{pullRequest.number}
|
||||
</a>
|
||||
</Tooltip>
|
||||
) : pullRequest ? (
|
||||
|
||||
@@ -375,14 +375,6 @@
|
||||
}
|
||||
.collapsed-search > svg { width: 20px; height: 20px; }
|
||||
.collapsed-search:active { background: var(--panel-hover); }
|
||||
/* Hand off sits before Search: only Search fills the pill's trailing padding. */
|
||||
.phone-layout .handoff-icon-button.collapsed-search { margin-right: -6px; }
|
||||
/* Whatever the row cannot fit is clipped at its end, never drawn under Hand off and Search. The clip edge sits 6px
|
||||
out from its items, where Search's box (and Hand off's) begins, so an end chip's focus ring and key hint show. */
|
||||
.phone-layout .collapsed-app-identity { overflow-x: clip; overflow-y: visible; margin-inline: -6px; padding-inline: 6px; }
|
||||
/* The 24px chips keep their size; their hit area is the pill's height. */
|
||||
.phone-layout .collapsed-platform { position: relative; }
|
||||
.phone-layout .collapsed-platform::before { content: ""; position: absolute; inset: -10px 0; }
|
||||
/* Text links and titles keep their size; their hit area grows into the space around them. */
|
||||
.phone-layout .collapsed-app-name,
|
||||
.phone-layout .collapsed-pr,
|
||||
|
||||
+1
-22
@@ -2448,28 +2448,7 @@ html [data-sonner-toaster][data-sonner-theme] {
|
||||
flex: none; display: inline-flex; height: 24px; align-items: center; gap: 6px; margin: 0; padding: 0 8px 0 10px; border: 0; border-radius: 7px;
|
||||
background: var(--element); color: var(--secondary); font: inherit; font-size: 12.5px; font-weight: 500; line-height: 16px; white-space: nowrap; cursor: pointer;
|
||||
}
|
||||
.collapsed-platform > svg { flex: none; width: 9px; height: 9px; }
|
||||
/* What the phone's fit leaves out (AppPill's data-drop) is not drawn. */
|
||||
.phone-layout .collapsed-app-identity[data-drop~="name"] > strong { display: none; }
|
||||
.phone-layout .collapsed-app-identity[data-drop~="pr"] > .tooltip-anchor:has(> .collapsed-pr) { display: none; }
|
||||
.collapsed-platform-label { display: flex; min-width: 0; overflow: hidden; }
|
||||
.collapsed-platform-label-text { min-width: 0; overflow: hidden; }
|
||||
.collapsed-platform-label-suffix { flex: none; white-space: pre; }
|
||||
/* The name a phone's row keeps gives way first, cut to its end down to its minimum, and the target's chip after it,
|
||||
down to its own; the fit reads both. */
|
||||
.phone-layout .collapsed-app-identity { --collapsed-name-min: 64px; --collapsed-target-min: 72px; }
|
||||
/* The target's label is the pill's one long configured text: once the phone's row has left out all it can, the name
|
||||
holds at its minimum and the target's chip shrinks instead. */
|
||||
.phone-layout .collapsed-app-identity[data-drop~="squeeze"] > strong { flex: none; max-width: var(--collapsed-name-min); }
|
||||
.phone-layout .collapsed-app-identity[data-drop~="squeeze"] .collapsed-target { flex: 0 1 auto; min-width: var(--collapsed-target-min); }
|
||||
.phone-layout .collapsed-app-identity[data-drop~="squeeze"] > .tooltip-anchor:has(> .collapsed-target) { flex: 0 1 auto; min-width: var(--collapsed-target-min); }
|
||||
.phone-layout .collapsed-app-identity[data-drop~="pose"] .collapsed-target .collapsed-platform-label-suffix { flex: 0 1 auto; min-width: 0; overflow: hidden; }
|
||||
/* The device's text gives way before the pose: it takes what the pose leaves, if anything. */
|
||||
.phone-layout .collapsed-app-identity[data-drop~="pose"] .collapsed-target .collapsed-platform-label-text { flex: 1 1 0; }
|
||||
/* A cut device or pose (AppPill's data-fade) fades out at its end rather than ending in "…" and the slack an ellipsis
|
||||
leaves; the full name is a tap away in its menu. */
|
||||
.phone-layout .collapsed-app-identity[data-fade~="device"] .collapsed-target .collapsed-platform-label-text,
|
||||
.phone-layout .collapsed-app-identity[data-fade~="pose"] .collapsed-target .collapsed-platform-label-suffix { mask-image: linear-gradient(to right, #000 calc(100% - 16px), transparent); }
|
||||
.collapsed-platform > svg { width: 9px; height: 9px; }
|
||||
.collapsed-platform > .collapsed-platform-busy { width: 11px; height: 11px; animation: spin 1s linear infinite; }
|
||||
.collapsed-platform:hover, .collapsed-platform[aria-expanded="true"] { color: var(--text); background: var(--hover); }
|
||||
.collapsed-platform:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
|
||||
|
||||
Reference in new issue
Block a user