← Commit history
0.12.0: Layers panel fits short viewers and groups part pieces (#12)
6 files changed
+298−21
VERSION+1−1@@ -1 +1 @@-0.11.1+0.12.0
docs/CONTENT-CONVENTIONS.md+3@@ -186,6 +186,9 @@ The **outermost** declaring node wins: declare on `Adom.LED.State` and its `Adom.LED.Emission` and `Adom.LED.Light` children ride with it, so one toggle turns the lens and its light off together. Rows appear in the Layers panel under "Parts", one per role, with the placement count when there are several.+Roles that share their first segment after `Adom.` (`Adom.Chip.Substrate`,+`Adom.Chip.Lens`, ...) collapse into one expandable row ("Chip (5)") whose box+switches them all and shows a mixed state when only some are on (0.12.0). A person's choice is remembered per browser, like the other viewer settings. The API: `getStateGroups()`, `setStateGroupEnabled(key, on)` for every
package.json+3−2@@ -1,6 +1,6 @@ { "name": "adom-3d-viewer-babylon9",- "version": "0.11.1",+ "version": "0.12.0", "description": "The Babylon 9.5 engine behind every component page's 3D tab on wiki.adom.inc. Versioned ESM bundle with GLB loading, view cube, layers toolbar, ground shadows, and Z-up CAD framing.", "type": "app", "main": "./dist/index.js",@@ -25,11 +25,12 @@ "prepare": "npm run build", "test:sandbox": "node test/wiki-sandbox.test.mjs", "test:orbit": "node test/orbit.test.mjs",- "test": "node test/wiki-sandbox.test.mjs && node test/orbit.test.mjs && node test/viewcube.test.mjs && node test/help.test.mjs && node test/lights.test.mjs && node test/replace.test.mjs && node test/bundle.test.mjs",+ "test": "node test/wiki-sandbox.test.mjs && node test/orbit.test.mjs && node test/viewcube.test.mjs && node test/help.test.mjs && node test/lights.test.mjs && node test/replace.test.mjs && node test/layers.test.mjs && node test/bundle.test.mjs", "test:viewcube": "node test/viewcube.test.mjs", "test:help": "node test/help.test.mjs", "test:lights": "node test/lights.test.mjs", "test:replace": "node test/replace.test.mjs",+ "test:layers": "node test/layers.test.mjs", "test:bundle": "node test/bundle.test.mjs" }, "dependencies": {},
src/ThreeDViewer.svelte+131−15@@ -658,6 +658,45 @@ })); } + // Parts rows (adom/adom-3d-viewer#12): a board's parts name their pieces+ // Adom.Chip.Substrate, Adom.Chip.Lens, ... as siblings, so each became+ // its own row and a 13-part board listed dozens. Rows that share a family+ // (the first name segment after "Adom.") now collapse into one expandable+ // row whose box switches them all; a family of one stays a plain row.+ type PartFamily = { key: string; label: string; groups: StateGroup[] };+ let expandedFamilies = new Set<string>();+ function familyOf(g: StateGroup): string {+ const base = String(g.key || '').replace(/^Adom\./i, '');+ return base.split('.')[0] || base;+ }+ function partFamilies(groups: StateGroup[]): PartFamily[] {+ const by = new Map<string, PartFamily>();+ for (const g of groups) {+ const k = familyOf(g);+ let f = by.get(k);+ if (!f) { f = { key: k, label: stateLabel(k, null), groups: [] }; by.set(k, f); }+ f.groups.push(g);+ }+ return [...by.values()];+ }+ /** "Chip Substrate" under "Chip" reads as "Substrate". */+ function memberLabel(f: PartFamily, g: StateGroup): string {+ const head = f.label.toLowerCase() + ' ';+ return g.label.toLowerCase().startsWith(head) ? g.label.slice(head.length) : g.label;+ }+ function setFamilyEnabled(f: PartFamily, enabled: boolean): void {+ for (const g of f.groups) setStateGroupEnabled(g.key, enabled);+ }+ function toggleFamilyOpen(key: string): void {+ if (expandedFamilies.has(key)) expandedFamilies.delete(key); else expandedFamilies.add(key);+ expandedFamilies = expandedFamilies;+ }+ /** A checkbox's mixed state is a property, not an attribute. */+ function indeterminate(node: HTMLInputElement, value: boolean) {+ node.indeterminate = value;+ return { update(v: boolean) { node.indeterminate = v; } };+ }+ /** Switch every placement of a role (the panel row). */ export function setStateGroupEnabled(key: string, enabled: boolean): boolean { const g = stateGroups.find(x => x.key === key);@@ -765,6 +804,7 @@ if (e.key === 'Escape' && dropdownOpen) { dropdownOpen = false; }+ if (e.key === 'Escape' && layersPanelOpen) layersPanelOpen = false; updatePivotChord(e); } @@ -1754,21 +1794,54 @@ Layers </button> {#if layersPanelOpen}- <div class="layers-panel">+ <div class="layers-panel" role="dialog" aria-label="Layers">+ <div class="layers-head">+ <span>Layers</span>+ <button type="button" class="layers-close" title="Close (Esc)" aria-label="Close layers" on:click={() => layersPanelOpen = false}>×</button>+ </div>+ <div class="layers-body"> {#if layers.some(l => l.intro)} <button type="button" class="layers-replay" title="Play the layer intro again" on:click={() => replayIntros()}>Replay intro</button> {/if} {#if stateGroups.length > 0} <div class="layers-group">Parts</div>- {#each stateGroups as group (group.key)}- <label class="layers-row">- <input- type="checkbox"- checked={group.enabled}- on:change={() => setStateGroupEnabled(group.key, !group.enabled)}- />- <span>{group.label}{group.roots.length > 1 ? ` (${group.roots.length})` : ''}</span>- </label>+ {#each partFamilies(stateGroups) as fam (fam.key)}+ {#if fam.groups.length === 1}+ <label class="layers-row">+ <input+ type="checkbox"+ checked={fam.groups[0].enabled}+ on:change={() => setStateGroupEnabled(fam.groups[0].key, !fam.groups[0].enabled)}+ />+ <span>{fam.groups[0].label}{fam.groups[0].roots.length > 1 ? ` (${fam.groups[0].roots.length})` : ''}</span>+ </label>+ {:else}+ <div class="layers-row layers-family">+ <input+ type="checkbox"+ aria-label={`Show ${fam.label}`}+ checked={fam.groups.every(g => g.enabled)}+ use:indeterminate={fam.groups.some(g => g.enabled) && !fam.groups.every(g => g.enabled)}+ on:change={() => setFamilyEnabled(fam, !fam.groups.every(g => g.enabled))}+ />+ <button type="button" class="layers-expand" aria-expanded={expandedFamilies.has(fam.key)} on:click={() => toggleFamilyOpen(fam.key)}>+ <span>{fam.label} ({fam.groups.length})</span>+ <span class="layers-chevron" aria-hidden="true">{expandedFamilies.has(fam.key) ? '\u25BE' : '\u25B8'}</span>+ </button>+ </div>+ {#if expandedFamilies.has(fam.key)}+ {#each fam.groups as group (group.key)}+ <label class="layers-row layers-member">+ <input+ type="checkbox"+ checked={group.enabled}+ on:change={() => setStateGroupEnabled(group.key, !group.enabled)}+ />+ <span>{memberLabel(fam, group)}{group.roots.length > 1 ? ` (${group.roots.length})` : ''}</span>+ </label>+ {/each}+ {/if}+ {/if} {/each} {/if} {#each layerGroups(layers) as section (section.group ?? '_')}@@ -1786,6 +1859,7 @@ </label> {/each} {/each}+ </div> </div> {/if} </div>@@ -1865,16 +1939,23 @@ /* Layers slide-out (#48) — left edge, vertically centered so it clears the embedding page's info bar (top) and the scene toggles (bottom). */+ /* The wrap spans the viewer's height (less a margin that keeps clear of+ the page's info bar and scene toggles where there is room), the toggle+ stays centered, and the panel is capped at that height with its own+ scroll and a pinned header (#12: in a 250 px viewer it ran past both+ edges and took its own close out of reach). */ .layers-wrap { position: absolute; left: 12px;- top: 50%;- transform: translateY(-50%);+ top: clamp(6px, 9%, 48px);+ bottom: clamp(6px, 9%, 48px); z-index: 20; display: flex;- align-items: flex-start;+ align-items: center; gap: 8px;+ pointer-events: none; }+ .layers-wrap > * { pointer-events: auto; } .layers-toggle { background: rgba(30, 34, 38, 0.92); border: 1px solid rgba(255, 255, 255, 0.12);@@ -1894,8 +1975,12 @@ background: rgba(40, 44, 48, 0.96); border: 1px solid rgba(255, 255, 255, 0.12); border-radius: 8px;- padding: 6px 0;- min-width: 150px;+ min-width: 170px;+ max-width: min(320px, calc(100vw - 80px));+ max-height: 100%;+ display: flex;+ flex-direction: column;+ overflow: hidden; box-shadow: 0 4px 12px rgba(0, 0, 0, 0.4); animation: layers-slide 0.15s ease-out; }@@ -1903,6 +1988,37 @@ from { opacity: 0; transform: translateX(-8px); } to { opacity: 1; transform: translateX(0); } }+ .layers-head {+ flex: none;+ display: flex;+ align-items: center;+ justify-content: space-between;+ gap: 8px;+ padding: 4px 4px 4px 12px;+ border-bottom: 1px solid rgba(255, 255, 255, 0.08);+ color: #d0d0d0;+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;+ font-size: 11px;+ text-transform: uppercase;+ letter-spacing: 0.06em;+ }+ .layers-close {+ width: 26px; height: 26px;+ display: inline-flex; align-items: center; justify-content: center;+ background: none; border: 0; border-radius: 6px;+ color: #d0d0d0; font-size: 18px; line-height: 1; cursor: pointer;+ }+ .layers-close:hover { background: rgba(255, 255, 255, 0.1); color: #ffffff; }+ .layers-close:focus-visible, .layers-expand:focus-visible { outline: 2px solid #00b8b0; outline-offset: 1px; }+ .layers-body { overflow-y: auto; min-height: 0; padding: 6px 0; overscroll-behavior: contain; }+ .layers-expand {+ flex: 1; min-width: 0;+ display: flex; align-items: center; justify-content: space-between; gap: 8px;+ background: none; border: 0; padding: 0; margin: 0;+ color: inherit; font: inherit; text-align: left; cursor: pointer;+ }+ .layers-chevron { opacity: 0.6; font-size: 11px; }+ .layers-member { padding-left: 34px; } .layers-group { font-size: 10px; text-transform: uppercase;
test/layers.test.mjsadded+153@@ -0,0 +1,153 @@+// Layers panel (adom/adom-3d-viewer#12), headless Chrome on the built bundle.+// A 13-part board whose parts name their pieces Adom.Chip.Substrate,+// Adom.Chip.Lens, ... as siblings, in a 250 px viewer and a full-height one:+// - the panel fits the viewer, its body scrolls, its header and close stay+// in view; Esc, the close button and the Layers tab each close it;+// - the Chip pieces are one expandable "Chip" row (its box switches them all,+// mixed when some are on), a family of one stays a plain row.+// Screenshots go to $SHOTS when set (the ralph pass looks at them).+import http from "node:http";+import { existsSync, readFileSync, readdirSync, mkdirSync } from "node:fs";+import { dirname, join, resolve } from "node:path";+import { fileURLToPath } from "node:url";++const __dirname = dirname(fileURLToPath(import.meta.url));+const ROOT = resolve(__dirname, "..");+const DIST = join(ROOT, "dist-standalone");+const SHOTS = process.env.SHOTS || "";+let passed = 0, failed = 0; const failures = [];+function assert(cond, msg) { if (cond) { passed++; console.log(" ok " + msg); } else { failed++; failures.push(msg); console.log(" FAIL " + msg); } }+function section(t) { console.log("\n [" + t + "]"); }++/** One cube mesh, many named nodes. `tree` is [{ name, mesh?, children? }]. */+function makeGlb(tree) {+ const pos = [], idx = [];+ const faces = [[[-1,-1,1],[1,-1,1],[1,1,1],[-1,1,1]],[[1,-1,-1],[-1,-1,-1],[-1,1,-1],[1,1,-1]],[[-1,1,1],[1,1,1],[1,1,-1],[-1,1,-1]],[[-1,-1,-1],[1,-1,-1],[1,-1,1],[-1,-1,1]],[[1,-1,1],[1,-1,-1],[1,1,-1],[1,1,1]],[[-1,-1,-1],[-1,-1,1],[-1,1,1],[-1,1,-1]]];+ faces.forEach((f, fi) => { f.forEach(v => pos.push(v[0] * 0.001, v[1] * 0.001, v[2] * 0.001)); const b = fi * 4; idx.push(b, b + 1, b + 2, b, b + 2, b + 3); });+ const pad = (b) => Buffer.concat([b, Buffer.alloc((4 - (b.length % 4)) % 4)]);+ const posBuf = pad(Buffer.from(new Float32Array(pos).buffer)), idxBuf = pad(Buffer.from(new Uint16Array(idx).buffer));+ const nodes = [];+ const add = (n, at) => {+ const i = nodes.length; nodes.push({ name: n.name, translation: at || [0, 0, 0] });+ if (n.mesh) nodes[i].mesh = 0;+ if (n.children) nodes[i].children = n.children.map((c, k) => add(c, [k * 0.003, 0, 0]));+ return i;+ };+ const roots = tree.map((n, k) => add(n, [0, k * 0.004, 0]));+ const json = {+ asset: { version: "2.0" }, scene: 0, scenes: [{ nodes: roots }], nodes,+ meshes: [{ name: "cube", primitives: [{ attributes: { POSITION: 0 }, indices: 1, material: 0 }] }],+ materials: [{ name: "m", pbrMetallicRoughness: { baseColorFactor: [0.7, 0.7, 0.7, 1] } }],+ buffers: [{ byteLength: posBuf.length + idxBuf.length }],+ bufferViews: [{ buffer: 0, byteOffset: 0, byteLength: posBuf.length }, { buffer: 0, byteOffset: posBuf.length, byteLength: idxBuf.length }],+ accessors: [+ { bufferView: 0, componentType: 5126, count: pos.length / 3, type: "VEC3", min: [-0.001, -0.001, -0.001], max: [0.001, 0.001, 0.001] },+ { bufferView: 1, componentType: 5123, count: idx.length, type: "SCALAR" },+ ],+ };+ const bin = Buffer.concat([posBuf, idxBuf]);+ let jsonBuf = Buffer.from(JSON.stringify(json)); jsonBuf = Buffer.concat([jsonBuf, Buffer.alloc((4 - (jsonBuf.length % 4)) % 4, 0x20)]);+ const header = Buffer.alloc(12); header.write("glTF", 0); header.writeUInt32LE(2, 4); header.writeUInt32LE(12 + 8 + jsonBuf.length + 8 + bin.length, 8);+ const ch = (len, type) => { const b = Buffer.alloc(8); b.writeUInt32LE(len, 0); b.write(type, 4); return b; };+ return Buffer.concat([header, ch(jsonBuf.length, "JSON"), jsonBuf, ch(bin.length, "BIN\0"), bin]);+}+const PIECES = ["Substrate", "TerminalK", "TerminalA", "Lens", "Die"];+const parts = Array.from({ length: 13 }, (_, i) => ({ name: `D${i + 1}`, children: [+ ...PIECES.map(p => ({ name: `Adom.Chip.${p}`, mesh: true })),+ { name: "Adom.LaserEtch", mesh: true },+] }));+const BOARD = makeGlb([+ { name: "board", children: [{ name: "fr4_board", mesh: true }, { name: "pad_top", mesh: true }, { name: "silk_top", mesh: true }, ...parts] },+]);++const HARNESS = (h) => `<!doctype html><html><head><meta charset="utf-8"><style>html,body{margin:0;height:100%;background:#000}#wrap{position:absolute;left:0;top:0;width:640px;height:${h}px}</style></head><body><div id="wrap"></div>+<script type="module">+ await import('/adom-3d-viewer-babylon9.esm.js');+ const v = window.Adom3DViewerBabylon9.init(document.getElementById('wrap'), { zUp: true, showViewCube: false, showHelp: false });+ await v.whenReady(); await v.loadModel('/board.glb'); window.__viewer = v; window.__ready = true;+</script></body></html>`;++if (!existsSync(join(DIST, "adom-3d-viewer-babylon9.esm.js"))) { console.error("dist-standalone missing; run npm run build:standalone first"); process.exit(2); }+let height = 250;+const server = http.createServer((req, res) => {+ const url = new URL(req.url, "http://x");+ if (url.pathname === "/board.glb") { res.writeHead(200, { "Content-Type": "model/gltf-binary" }); return res.end(BOARD); }+ if (url.pathname === "/view.html") { res.writeHead(200, { "Content-Type": "text/html" }); return res.end(HARNESS(height)); }+ const file = join(DIST, url.pathname.replace(/^\/+/, ""));+ if (file.startsWith(DIST) && existsSync(file)) { res.writeHead(200, { "Content-Type": file.endsWith(".js") ? "text/javascript" : "application/octet-stream" }); return res.end(readFileSync(file)); }+ res.writeHead(404); res.end();+});+await new Promise(r => server.listen(0, "127.0.0.1", r));+const port = server.address().port;+let puppeteer; try { puppeteer = (await import("puppeteer-core")).default; } catch { puppeteer = (await import(resolve(ROOT, "..", "node_modules", "puppeteer-core", "lib", "puppeteer", "puppeteer-core.js"))).default; }+function findChrome() {+ const env = process.env.PUPPETEER_EXECUTABLE_PATH; if (env && existsSync(env)) return env;+ const base = join(process.env.HOME || "", ".cache", "puppeteer", "chrome");+ if (existsSync(base)) for (const d of readdirSync(base)) { const p = join(base, d, "chrome-linux64", "chrome"); if (existsSync(p)) return p; }+ throw new Error("no Chrome found; set PUPPETEER_EXECUTABLE_PATH");+}+if (SHOTS) mkdirSync(SHOTS, { recursive: true });+const browser = await puppeteer.launch({ executablePath: findChrome(), headless: true, args: ["--no-sandbox", "--use-gl=angle", "--use-angle=swiftshader", "--enable-unsafe-swiftshader", "--disable-gpu-sandbox"] });+const rect = (page, sel) => page.evaluate((s) => { const e = document.querySelector(s); if (!e) return null; const r = e.getBoundingClientRect(); return { top: r.top, bottom: r.bottom, left: r.left, right: r.right, h: r.height }; }, sel);+try {+ for (const h of [250, 560]) {+ height = h;+ const page = await browser.newPage();+ await page.setViewport({ width: 640, height: h });+ await page.goto(`http://127.0.0.1:${port}/view.html`, { waitUntil: "load", timeout: 90000 });+ await page.waitForFunction("window.__ready === true", { timeout: 90000 });++ section(`a ${h} px viewer: the open panel fits, its header and close stay in reach`);+ await page.click(".layers-toggle");+ await page.waitForSelector(".layers-panel");+ const panel = await rect(page, ".layers-panel"), close = await rect(page, ".layers-close"), head = await rect(page, ".layers-head");+ assert(panel && panel.top >= 0 && panel.bottom <= h, `panel inside the viewer (${panel && Math.round(panel.top)}..${panel && Math.round(panel.bottom)} of ${h})`);+ assert(close && close.top >= 0 && close.bottom <= h, "the close button is on screen");+ const scroll = await page.evaluate(() => { const b = document.querySelector(".layers-body"); const before = b.getBoundingClientRect().top; b.scrollTop = b.scrollHeight; return { sh: b.scrollHeight, ch: b.clientHeight, top: b.scrollTop }; });+ const headAfter = await rect(page, ".layers-head");+ assert(scroll.sh <= scroll.ch || scroll.top > 0, `the body scrolls when it is taller than the panel (${scroll.sh} > ${scroll.ch})`);+ assert(head && headAfter && Math.abs(head.top - headAfter.top) < 1, "the header stays put while the body scrolls");+ if (SHOTS) await page.screenshot({ path: join(SHOTS, `layers-${h}-open.png`) });++ section("the Chip pieces are one expandable row; a family of one stays plain");+ const rows = await page.evaluate(() => [...document.querySelectorAll(".layers-body .layers-row")].map(r => ({ text: r.textContent.trim().replace(/\s+/g, " "), family: r.classList.contains("layers-family"), member: r.classList.contains("layers-member") })));+ const fam = rows.filter(r => r.family);+ assert(fam.length === 1 && /^Chip \(5\)/.test(fam[0].text), `one family row "Chip (5)" (${JSON.stringify(fam.map(r => r.text))})`);+ assert(rows.some(r => !r.family && /^Laser etch \(13\)/i.test(r.text)), "Laser etch, a family of one, is a plain row with its count");+ assert(rows.filter(r => r.member).length === 0, "collapsed: no member rows yet");+ const partsRows = rows.filter(r => /Chip|Laser/.test(r.text)).length;+ assert(partsRows === 2, `13 parts x 6 pieces read as 2 rows (${partsRows})`);+ await page.click(".layers-family .layers-expand");+ const members = await page.evaluate(() => [...document.querySelectorAll(".layers-member")].map(r => r.textContent.trim().replace(/\s+/g, " ")));+ assert(members.length === 5 && members.includes("Substrate (13)") && members.includes("Terminal K (13)"), `expanded: the five pieces, short labels (${members.join(", ")})`);+ if (SHOTS) await page.screenshot({ path: join(SHOTS, `layers-${h}-expanded.png`) });++ section("the family box switches every piece; one piece off makes it mixed");+ await page.click(".layers-family input");+ let st = await page.evaluate(() => ({ groups: window.__viewer.getStateGroups().filter(g => /Chip/.test(g.key)).map(g => g.enabled), box: document.querySelector(".layers-family input").checked }));+ assert(st.groups.length === 5 && st.groups.every(e => e === false) && st.box === false, "unchecking the family turns all five off");+ await page.click(".layers-member input");+ st = await page.evaluate(() => { const b = document.querySelector(".layers-family input"); return { on: window.__viewer.getStateGroups().filter(g => /Chip/.test(g.key) && g.enabled).length, ind: b.indeterminate, box: b.checked }; });+ assert(st.on === 1 && st.ind === true && st.box === false, `one piece back on: the family box is mixed (${JSON.stringify(st)})`);+ await page.click(".layers-family input");+ st = await page.evaluate(() => ({ on: window.__viewer.getStateGroups().filter(g => /Chip/.test(g.key) && g.enabled).length, ind: document.querySelector(".layers-family input").indeterminate }));+ assert(st.on === 5 && st.ind === false, "clicking a mixed box turns them all on");++ section("Esc, the close button and the Layers tab each close it");+ await page.keyboard.press("Escape");+ assert(!(await page.$(".layers-panel")), "Esc closes the panel");+ await page.click(".layers-toggle"); await page.waitForSelector(".layers-panel");+ await page.click(".layers-close");+ assert(!(await page.$(".layers-panel")), "the close button closes it");+ await page.click(".layers-toggle"); await page.waitForSelector(".layers-panel");+ await page.click(".layers-toggle");+ assert(!(await page.$(".layers-panel")), "the Layers tab closes it again");+ await page.close();+ }+} finally {+ await browser.close();+ server.close();+}+console.log(`\n=== layers ===\n${passed} passed, ${failed} failed`);+if (failures.length) for (const f of failures) console.log(" - " + f);+process.exit(failed ? 1 : 0);
vite.standalone.config.mts+7−3@@ -9,8 +9,10 @@ import { transform } from 'esbuild'; const minifyChunks = () => ({ name: 'adom-minify-chunks', async renderChunk(code: string) {- const out = await transform(code, { minify: true, format: 'esm', target: 'es2020', legalComments: 'none' });- return { code: out.code, map: null };+ // The map rides along so the hidden build maps (below) still point at+ // the source after minification.+ const out = await transform(code, { minify: true, format: 'esm', target: 'es2020', legalComments: 'none', sourcemap: 'external' });+ return { code: out.code, map: out.map || null }; }, }); @@ -55,7 +57,9 @@ export default defineConfig({ }, outDir: 'dist-standalone', minify: 'esbuild',- sourcemap: false,+ // Hidden: the maps are written for turning a reported position+ // (chunk-x.js:1:23456) back into a source line, never referenced or served.+ sourcemap: "hidden", chunkSizeWarningLimit: 50000, target: 'es2020', },