mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-05-11 17:54:44 +00:00
dfacfd0f6e
Fixes #1141 follow-up — the visible-on-staging SCOPE→SCOP clip that the prior PRs (#1137, #1141) intended to address but didn't. ## What was actually broken (ground truth from staging) Staging at `http://20.109.157.39:80/` renders the inline navbar SVG correctly — duotone CORE/SCOPE fills inherit page CSS vars, mobile mark-only swap fires at ≤400px, customizer logo override path works. Those parts of #1137 + #1141 landed cleanly. What did **NOT** land: the SVG `viewBox` was never widened to fit the rendered Aldrich wordmark. At every desktop viewport the SCOPE `<text text-anchor="start" x="773.8">` produces a bbox extending to user-space x≈1112, but the navbar `viewBox="170 10 860 280"` ends at x=1030. Result: SCOPE renders as **SCOP** on every desktop load. CORE also slightly overflows the left edge (bbox.x=153.7 < viewBox.x=170). The original brief premise (mushroom emoji still in `index.html` + `<img>`-loaded SVG monotone fallback on staging) does not match current state — `public/index.html:45` already has the inline SVG, staging renders it, and computed fills are duotone (`rgb(74,158,255)` vs `rgb(109,179,255)`). The visible bug is geometric clipping, not CSS-var inheritance or a mushroom revert. ## Fix (one-liner SVG geometry change) - `public/index.html` — navbar `svg.brand-logo`: `viewBox="170 10 860 280"` → `viewBox="150 10 970 280"`; intrinsic `width="111"` → `width="125"` (preserves ~36px nav row height). - `public/style.css` — `.brand-logo { width }` 111px → 125px (desktop), tablet `@media (max-width:900px)` pin 99px → 112px to keep the new aspect ratio so wordmark still doesn't clip on tablets. - `public/customize-v2.js` — `_setBrandLogoUrl` `<img>` swap dimensions updated to match (when an operator overrides `branding.logoUrl`). The `≤400px` mobile mark-only swap is unchanged — at narrow widths the wordmark still hides entirely and the dedicated `.brand-mark-only` SVG (no `<text>`) renders. ## TDD (red → green) | commit | role | |---|---| | `16b7a60` | **RED** — `test-logo-theme-e2e.js` assertion #7: every `CORE`/`SCOPE` `<text>` bbox must fit inside the SVG `viewBox`. Master fails: `[{text:CORE, bboxX:153.7, bboxRight:426.2, vbX:170}, {text:SCOPE, bboxX:773.8, bboxRight:1111.5, vbRight:1030}]` | | `0db473b` | **GREEN** — widen viewBox + width to fit | Test exercises real `getBBox()` measurement on a headless Chromium DOM with the Aldrich webfont loaded — not a unit-test fill string check. The earlier #1141 tests asserted computed `fill` colors (which were correct) but never measured rendered geometry; that's the gap. ## Visual proof **Before** (master HEAD against staging, viewport 1280): `/tmp/staging-logo-before-1280.png` — SCOPE clearly clipped to "SCOP". **After** (this branch against local server, viewport 1280): `/tmp/local-after-1280-screen.png` — full CORE / SCOPE rendered. **Mobile (after, 375px)**: `/tmp/local-after-mobile.png` — mark-only SVG (no wordmark, no clip). ## Preflight `bash ~/.openclaw/skills/pr-preflight/scripts/run-all.sh origin/master` — all hard gates clean (PII, branch-scope, red-commit-genuine, css-vars-defined, css-self-fallback, like-on-json, sync-migration), all warnings clean (img-svg-ratio, themed-img-svg, fixture-coverage). E2E assertion added: `test-logo-theme-e2e.js:286-310` Browser verified: `/tmp/local-after-1280-screen.png` (local server) + `/tmp/staging-logo-before-1280.png` (staging baseline). --------- Co-authored-by: corescope-bot <bot@corescope.local>
332 lines
16 KiB
JavaScript
332 lines
16 KiB
JavaScript
#!/usr/bin/env node
|
|
/* Logo theme reactivity E2E — verifies that the navbar + hero logos
|
|
* inherit page CSS custom properties and remain visible when the user
|
|
* switches to the Light theme.
|
|
*
|
|
* Asserts:
|
|
* 1. With data-theme="light", the navbar wordmark CORE/SCOPE elements
|
|
* have a computed fill that is NOT the legacy hardcoded sage
|
|
* (#cfd9c9 / rgb(207,217,201)).
|
|
* 2. The hero SVG does NOT contain a full-canvas opaque background
|
|
* rect (no <rect width=1200 height=300> with a non-transparent fill
|
|
* reachable via the inline SVG in the home-hero region).
|
|
* 3. The hero wordmark CORE/SCOPE compute-fills also drop the legacy
|
|
* sage hex when the page theme is Light.
|
|
* 4. The navbar wordmark is duotone — CORE fill !== SCOPE fill — and
|
|
* remains so under both default (dark) and Light themes. Proves the
|
|
* fog/teal split survives the light-theme rebind.
|
|
* 5. The hero wordmark is also duotone (CORE !== SCOPE) under both
|
|
* themes.
|
|
* 6. At mobile width (360x640), the navbar swaps to a mark-only
|
|
* .brand-mark-only inline SVG (visible) while the full .brand-logo
|
|
* is display:none — preventing the SCOPE→SCOF clip seen with the
|
|
* 99px mobile pin from #1137. Also asserts the visible navbar logo
|
|
* fits within .nav-left's right edge (no horizontal overflow).
|
|
*
|
|
* Designed to FAIL on the pre-fix branch (where the SVGs are loaded as
|
|
* <img>, the wordmark fill is baked to #cfd9c9, and the hero SVG ships a
|
|
* solid <rect fill="var(--logo-bg, #0e1714)">).
|
|
*/
|
|
'use strict';
|
|
|
|
const { chromium } = require('playwright');
|
|
|
|
const BASE = process.env.BASE_URL || 'http://localhost:13581';
|
|
const LEGACY_SAGE = 'rgb(207, 217, 201)';
|
|
|
|
function fail(msg) {
|
|
console.error(`test-logo-theme-e2e.js: FAIL — ${msg}`);
|
|
process.exit(1);
|
|
}
|
|
|
|
async function main() {
|
|
const requireChromium = process.env.CHROMIUM_REQUIRE === '1';
|
|
let browser;
|
|
try {
|
|
browser = await chromium.launch({
|
|
headless: true,
|
|
executablePath: process.env.CHROMIUM_PATH || undefined,
|
|
args: ['--no-sandbox', '--disable-gpu', '--disable-dev-shm-usage'],
|
|
});
|
|
} catch (err) {
|
|
if (requireChromium) {
|
|
console.error(`test-logo-theme-e2e.js: FAIL — Chromium required but unavailable: ${err.message}`);
|
|
process.exit(1);
|
|
}
|
|
console.log(`test-logo-theme-e2e.js: SKIP (Chromium unavailable: ${err.message.split('\n')[0]})`);
|
|
process.exit(0);
|
|
}
|
|
|
|
let passed = 0;
|
|
const total = 7;
|
|
try {
|
|
const context = await browser.newContext({ viewport: { width: 1280, height: 900 } });
|
|
const page = await context.newPage();
|
|
page.setDefaultTimeout(10000);
|
|
|
|
// Force Light theme BEFORE first navigation so initial paint uses it.
|
|
await page.addInitScript(() => {
|
|
try { localStorage.setItem('meshcore-user-level', 'experienced'); } catch (_) {}
|
|
});
|
|
|
|
await page.goto(BASE + '/#/', { waitUntil: 'domcontentloaded' });
|
|
await page.waitForSelector('.nav-brand', { timeout: 8000 });
|
|
await page.evaluate(() => { document.documentElement.setAttribute('data-theme', 'light'); });
|
|
|
|
// 1. Navbar wordmark must be inline-SVG <text> (not <img>) and computed
|
|
// fill must NOT be the legacy hardcoded sage. We grep for any <text>
|
|
// with textContent CORE or SCOPE inside .nav-brand.
|
|
const navWordmarkFills = await page.evaluate(() => {
|
|
const out = [];
|
|
const root = document.querySelector('.nav-brand');
|
|
if (!root) return { error: '.nav-brand missing' };
|
|
const texts = root.querySelectorAll('svg text');
|
|
texts.forEach((t) => {
|
|
const tc = (t.textContent || '').trim();
|
|
if (tc === 'CORE' || tc === 'SCOPE') {
|
|
out.push({ tc, fill: getComputedStyle(t).fill });
|
|
}
|
|
});
|
|
return { out };
|
|
});
|
|
if (navWordmarkFills.error) fail(navWordmarkFills.error);
|
|
if (!navWordmarkFills.out || navWordmarkFills.out.length < 2) {
|
|
fail(`navbar inline-SVG wordmark <text> CORE/SCOPE not found (found: ${JSON.stringify(navWordmarkFills.out)}). Navbar logo must be inline <svg> so CSS vars apply.`);
|
|
}
|
|
for (const w of navWordmarkFills.out) {
|
|
if (w.fill === LEGACY_SAGE) {
|
|
fail(`navbar wordmark "${w.tc}" still computes legacy sage fill ${LEGACY_SAGE} — wordmark fill must theme via CSS var`);
|
|
}
|
|
}
|
|
console.log(` ✅ navbar wordmark fills are theme-reactive (${navWordmarkFills.out.map((w) => w.tc + '=' + w.fill).join(', ')})`);
|
|
passed++;
|
|
|
|
// 2. Hero SVG must NOT have a full-canvas opaque background rect.
|
|
await page.evaluate(() => { window.location.hash = '#/home'; });
|
|
await page.waitForFunction(() => location.hash === '#/home');
|
|
await page.waitForSelector('.home-hero', { timeout: 8000 });
|
|
// Ensure light theme survives reload.
|
|
await page.evaluate(() => { document.documentElement.setAttribute('data-theme', 'light'); });
|
|
|
|
const heroBg = await page.evaluate(() => {
|
|
const hero = document.querySelector('.home-hero');
|
|
if (!hero) return { error: '.home-hero missing' };
|
|
const svg = hero.querySelector('svg');
|
|
if (!svg) return { error: '.home-hero has no inline <svg> child (hero must be inline so CSS vars apply)' };
|
|
// Look for a child <rect> that covers the entire viewBox with a non-transparent fill.
|
|
const rects = svg.querySelectorAll('rect');
|
|
const offending = [];
|
|
rects.forEach((r) => {
|
|
const w = r.getAttribute('width') || '';
|
|
const h = r.getAttribute('height') || '';
|
|
const cs = getComputedStyle(r);
|
|
const fill = cs.fill || '';
|
|
const op = parseFloat(cs.fillOpacity || '1');
|
|
// legacy hero shipped <rect width=1200 height=300 fill=var(--logo-bg, #0e1714)>
|
|
if ((w === '1200' || w === '100%') && (h === '300' || h === '100%') && fill && fill !== 'none' && fill !== 'rgba(0, 0, 0, 0)' && op > 0.05) {
|
|
offending.push({ w, h, fill, op });
|
|
}
|
|
});
|
|
return { offending, rectCount: rects.length };
|
|
});
|
|
if (heroBg.error) fail(heroBg.error);
|
|
if (heroBg.offending && heroBg.offending.length > 0) {
|
|
fail(`hero SVG has full-canvas opaque background rect — paints over light theme: ${JSON.stringify(heroBg.offending)}`);
|
|
}
|
|
console.log(` ✅ hero SVG has no full-canvas opaque background rect`);
|
|
passed++;
|
|
|
|
// 3. Hero wordmark CORE/SCOPE must not compute legacy sage fill on light theme.
|
|
const heroWordmarkFills = await page.evaluate(() => {
|
|
const hero = document.querySelector('.home-hero');
|
|
if (!hero) return { error: '.home-hero missing' };
|
|
const out = [];
|
|
hero.querySelectorAll('svg text').forEach((t) => {
|
|
const tc = (t.textContent || '').trim();
|
|
if (tc === 'CORE' || tc === 'SCOPE') {
|
|
out.push({ tc, fill: getComputedStyle(t).fill });
|
|
}
|
|
});
|
|
return { out };
|
|
});
|
|
if (heroWordmarkFills.error) fail(heroWordmarkFills.error);
|
|
if (!heroWordmarkFills.out || heroWordmarkFills.out.length < 2) {
|
|
fail(`hero inline-SVG wordmark <text> CORE/SCOPE not found (found: ${JSON.stringify(heroWordmarkFills.out)})`);
|
|
}
|
|
for (const w of heroWordmarkFills.out) {
|
|
if (w.fill === LEGACY_SAGE) {
|
|
fail(`hero wordmark "${w.tc}" still computes legacy sage fill ${LEGACY_SAGE} — invisible on light theme`);
|
|
}
|
|
}
|
|
console.log(` ✅ hero wordmark fills are theme-reactive (${heroWordmarkFills.out.map((w) => w.tc + '=' + w.fill).join(', ')})`);
|
|
passed++;
|
|
|
|
// 4 & 5. Duotone — CORE fill must differ from SCOPE fill in BOTH navbar
|
|
// and hero, under BOTH default (dark) and Light themes. Proves the
|
|
// fog/teal split is preserved across theme rebinds.
|
|
async function fillsByText(rootSelector) {
|
|
return await page.evaluate((sel) => {
|
|
const root = document.querySelector(sel);
|
|
if (!root) return { error: sel + ' missing' };
|
|
const m = {};
|
|
root.querySelectorAll('svg text').forEach((t) => {
|
|
const tc = (t.textContent || '').trim();
|
|
if (tc === 'CORE' || tc === 'SCOPE') m[tc] = getComputedStyle(t).fill;
|
|
});
|
|
return { m };
|
|
}, rootSelector);
|
|
}
|
|
function isNearWhiteOrBlack(rgb) {
|
|
const m = String(rgb).match(/rgb\((\d+),\s*(\d+),\s*(\d+)/);
|
|
if (!m) return false;
|
|
const [r, g, b] = [+m[1], +m[2], +m[3]];
|
|
const max = Math.max(r, g, b), min = Math.min(r, g, b);
|
|
// near-white: all >= 235. near-black: all <= 25 AND low chroma.
|
|
if (r >= 235 && g >= 235 && b >= 235) return true;
|
|
if (r <= 25 && g <= 25 && b <= 25) return true;
|
|
// also flag fully-desaturated greys (chroma < 10)
|
|
if ((max - min) < 10 && max > 60 && max < 200) return true;
|
|
return false;
|
|
}
|
|
|
|
// Navigate back to root + force DEFAULT (dark) theme.
|
|
await page.evaluate(() => { window.location.hash = '#/'; });
|
|
await page.waitForFunction(() => location.hash === '#/');
|
|
await page.waitForSelector('.nav-brand', { timeout: 8000 });
|
|
await page.evaluate(() => { document.documentElement.removeAttribute('data-theme'); });
|
|
|
|
const navDark = await fillsByText('.nav-brand');
|
|
if (navDark.error) fail(navDark.error);
|
|
if (!navDark.m.CORE || !navDark.m.SCOPE) fail(`navbar (dark) missing CORE/SCOPE: ${JSON.stringify(navDark.m)}`);
|
|
if (navDark.m.CORE === navDark.m.SCOPE) {
|
|
fail(`navbar (dark) wordmark is monotone — CORE=${navDark.m.CORE} SCOPE=${navDark.m.SCOPE}; duotone (fog/teal) must be preserved`);
|
|
}
|
|
if (isNearWhiteOrBlack(navDark.m.CORE)) fail(`navbar (dark) CORE fill is near-white/black/grey: ${navDark.m.CORE}`);
|
|
if (isNearWhiteOrBlack(navDark.m.SCOPE)) fail(`navbar (dark) SCOPE fill is near-white/black/grey: ${navDark.m.SCOPE}`);
|
|
|
|
// Light theme
|
|
await page.evaluate(() => { document.documentElement.setAttribute('data-theme', 'light'); });
|
|
const navLight = await fillsByText('.nav-brand');
|
|
if (navLight.error) fail(navLight.error);
|
|
if (navLight.m.CORE === navLight.m.SCOPE) {
|
|
fail(`navbar (light) wordmark is monotone — CORE=${navLight.m.CORE} SCOPE=${navLight.m.SCOPE}; duotone must survive light-theme rebind`);
|
|
}
|
|
console.log(` ✅ navbar duotone preserved (dark: CORE=${navDark.m.CORE} SCOPE=${navDark.m.SCOPE}; light: CORE=${navLight.m.CORE} SCOPE=${navLight.m.SCOPE})`);
|
|
passed++;
|
|
|
|
// Hero duotone
|
|
await page.evaluate(() => { window.location.hash = '#/home'; });
|
|
await page.waitForFunction(() => location.hash === '#/home');
|
|
await page.waitForSelector('.home-hero', { timeout: 8000 });
|
|
await page.evaluate(() => { document.documentElement.removeAttribute('data-theme'); });
|
|
const heroDark = await fillsByText('.home-hero');
|
|
if (heroDark.error) fail(heroDark.error);
|
|
if (heroDark.m.CORE === heroDark.m.SCOPE) {
|
|
fail(`hero (dark) wordmark is monotone — CORE=${heroDark.m.CORE} SCOPE=${heroDark.m.SCOPE}; duotone must be preserved`);
|
|
}
|
|
if (isNearWhiteOrBlack(heroDark.m.CORE)) fail(`hero (dark) CORE fill is near-white/black/grey: ${heroDark.m.CORE}`);
|
|
if (isNearWhiteOrBlack(heroDark.m.SCOPE)) fail(`hero (dark) SCOPE fill is near-white/black/grey: ${heroDark.m.SCOPE}`);
|
|
|
|
await page.evaluate(() => { document.documentElement.setAttribute('data-theme', 'light'); });
|
|
const heroLight = await fillsByText('.home-hero');
|
|
if (heroLight.error) fail(heroLight.error);
|
|
if (heroLight.m.CORE === heroLight.m.SCOPE) {
|
|
fail(`hero (light) wordmark is monotone — CORE=${heroLight.m.CORE} SCOPE=${heroLight.m.SCOPE}; duotone must survive light-theme rebind`);
|
|
}
|
|
console.log(` ✅ hero duotone preserved (dark: CORE=${heroDark.m.CORE} SCOPE=${heroDark.m.SCOPE}; light: CORE=${heroLight.m.CORE} SCOPE=${heroLight.m.SCOPE})`);
|
|
passed++;
|
|
|
|
// 6. Mobile fit: at 360x640 the full wordmark logo must be hidden and
|
|
// a mark-only .brand-mark-only inline SVG must take its place. Also
|
|
// asserts the visible logo's right edge does not overflow .nav-left.
|
|
await page.setViewportSize({ width: 360, height: 640 });
|
|
await page.evaluate(() => { window.location.hash = '#/'; });
|
|
await page.waitForFunction(() => location.hash === '#/');
|
|
await page.waitForSelector('.nav-brand', { timeout: 8000 });
|
|
// Allow CSS media query to settle.
|
|
await page.waitForTimeout(100);
|
|
|
|
const mobile = await page.evaluate(() => {
|
|
const brand = document.querySelector('.nav-brand');
|
|
if (!brand) return { error: '.nav-brand missing' };
|
|
const full = brand.querySelector('svg.brand-logo');
|
|
const mark = brand.querySelector('svg.brand-mark-only');
|
|
const left = document.querySelector('.nav-left');
|
|
const fullVisible = full ? getComputedStyle(full).display !== 'none' : null;
|
|
const markVisible = mark ? getComputedStyle(mark).display !== 'none' : null;
|
|
const visibleSvg = (mark && markVisible) ? mark : (full && fullVisible) ? full : null;
|
|
const visRect = visibleSvg ? visibleSvg.getBoundingClientRect() : null;
|
|
const leftRect = left ? left.getBoundingClientRect() : null;
|
|
return {
|
|
hasFull: !!full,
|
|
hasMark: !!mark,
|
|
fullVisible,
|
|
markVisible,
|
|
visRectRight: visRect ? visRect.right : null,
|
|
leftRectRight: leftRect ? leftRect.right : null,
|
|
viewportWidth: window.innerWidth,
|
|
};
|
|
});
|
|
if (mobile.error) fail(mobile.error);
|
|
if (!mobile.hasMark) {
|
|
fail(`mobile: .brand-mark-only inline SVG missing — required to avoid SCOPE→SCOF clip on ≤400px viewports`);
|
|
}
|
|
if (!mobile.markVisible) {
|
|
fail(`mobile: .brand-mark-only is hidden at 360px — must be display!=none on ≤400px viewports (computed: hidden)`);
|
|
}
|
|
if (mobile.fullVisible) {
|
|
fail(`mobile: .brand-logo (full wordmark SVG) still display!=none at 360px — must be hidden so it cannot clip; visibleRight=${mobile.visRectRight}`);
|
|
}
|
|
if (mobile.visRectRight !== null && mobile.viewportWidth > 0 && mobile.visRectRight > mobile.viewportWidth) {
|
|
fail(`mobile: visible navbar logo right edge ${mobile.visRectRight}px overflows viewport (${mobile.viewportWidth}px)`);
|
|
}
|
|
console.log(` ✅ mobile (360px): mark-only swap active (full hidden, mark visible, right=${mobile.visRectRight}px ≤ viewport ${mobile.viewportWidth}px)`);
|
|
passed++;
|
|
|
|
// 7. Desktop wordmark must NOT clip — every <text> element's bbox in
|
|
// user-space coords must lie fully inside the SVG's viewBox. The
|
|
// original navbar SVG ships with viewBox "170 10 860 280" (right
|
|
// edge x=1030), but the SCOPE <text> with text-anchor="start" at
|
|
// x=773.8 + width≈338 extends to x≈1111 — clipped to "SCOP" at
|
|
// every desktop viewport width. Fix: widen the viewBox so the
|
|
// wordmark fits.
|
|
await page.setViewportSize({ width: 1280, height: 800 });
|
|
await page.evaluate(() => { window.location.hash = '#/'; });
|
|
await page.waitForFunction(() => location.hash === '#/');
|
|
await page.waitForSelector('.nav-brand svg.brand-logo', { timeout: 8000 });
|
|
await page.waitForTimeout(150);
|
|
const clip = await page.evaluate(() => {
|
|
const svg = document.querySelector('.nav-brand svg.brand-logo');
|
|
if (!svg) return { error: '.nav-brand svg.brand-logo missing' };
|
|
const vb = (svg.getAttribute('viewBox') || '').split(/\s+/).map(Number);
|
|
if (vb.length !== 4) return { error: 'viewBox malformed: ' + svg.getAttribute('viewBox') };
|
|
const [vx, vy, vw, vh] = vb;
|
|
const offenders = [];
|
|
svg.querySelectorAll('text').forEach((t) => {
|
|
const tc = (t.textContent || '').trim();
|
|
if (tc !== 'CORE' && tc !== 'SCOPE') return;
|
|
const bb = t.getBBox();
|
|
if (bb.x < vx - 0.5 || bb.x + bb.width > vx + vw + 0.5) {
|
|
offenders.push({ text: tc, bboxX: bb.x, bboxRight: bb.x + bb.width, vbX: vx, vbRight: vx + vw });
|
|
}
|
|
});
|
|
return { viewBox: vb, offenders };
|
|
});
|
|
if (clip.error) fail(clip.error);
|
|
if (clip.offenders && clip.offenders.length) {
|
|
fail(`desktop: wordmark <text> overflows SVG viewBox (will be clipped): ${JSON.stringify(clip.offenders)}`);
|
|
}
|
|
console.log(` ✅ desktop (1280px): CORE/SCOPE bboxes fit inside viewBox ${JSON.stringify(clip.viewBox)}`);
|
|
passed++;
|
|
|
|
await browser.close();
|
|
console.log(`\ntest-logo-theme-e2e.js: ${passed}/${total} PASS`);
|
|
} catch (err) {
|
|
try { await browser.close(); } catch (_) {}
|
|
console.error(`test-logo-theme-e2e.js: FAIL — ${err.message}`);
|
|
process.exit(1);
|
|
}
|
|
}
|
|
|
|
main();
|