diff --git a/.github/workflows/ui-smoke.yml b/.github/workflows/ui-smoke.yml index 74b6a40fd..a98adbb74 100644 --- a/.github/workflows/ui-smoke.yml +++ b/.github/workflows/ui-smoke.yml @@ -359,6 +359,8 @@ jobs: run: python tests/approved_native_wire_gain_smoke.py - name: Stage D one runtime CSSOM and actual stylesheet network count run: python tests/approved_css_stage_d_single_bundle_smoke.py + - name: Contextual GAIN/FX and Sends-on-Faders browser workflow + run: python tests/sof_contextual_console_smoke.py - name: Stage C rendered CSS parity (original vs compiled, three viewports + hover) run: python tests/approved_css_stage_c_computed_parity_smoke.py - name: WIRE A main edge and safe graph integration in real Chromium DOM diff --git a/site/preview-buttons/assets/mixer-control-keys.css b/site/preview-buttons/assets/mixer-control-keys.css index 6996d2e17..8f1a67279 100644 --- a/site/preview-buttons/assets/mixer-control-keys.css +++ b/site/preview-buttons/assets/mixer-control-keys.css @@ -113,3 +113,28 @@ @media(prefers-reduced-motion:reduce){ .app .console-body .strip .mx-hw-row>button.mx-hw-key{transition:none!important} } + +/* SAME approved Harmonice v9 sprite in contextual SOF FX cell. + No new generated button artwork, CSS approximation or alternate state. */ +.app .console-body .strip .mx-sof-tap-key{ + position:relative;display:block;flex:0 0 55px;width:55px;height:29px; + margin:0;padding:0;border:0;background:transparent;overflow:visible; + isolation:isolate;cursor:pointer;color:transparent;font-size:0;line-height:0; +} +.app .console-body .strip .mx-sof-tap-key::before{ + content:"";position:absolute;inset:0;display:block;pointer-events:none; + background-image:url("harmonice-thin-flat-v9-approved-off-shadow-57x30.png"); + background-repeat:no-repeat;background-size:400% 300%; + background-position:var(--mx-native-x,33.333333%) 0%; +} +.app .console-body .strip .mx-sof-tap-key[data-tap-visual="pre"]{--mx-native-x:0%} +.app .console-body .strip .mx-sof-tap-key[data-tap-visual="idle"]{--mx-native-x:33.333333%} +.app .console-body .strip .mx-sof-tap-key[data-tap-visual="post"]{--mx-native-x:66.666667%} +.app .console-body .strip .mx-sof-tap-key[data-tap-visual="mixed"]{--mx-native-x:100%} +.app .console-body .strip .mx-sof-tap-key:disabled{opacity:.72;cursor:default} +.app .console-body .strip .mx-sof-tap-key:focus-visible{outline:2px solid #9eddec;outline-offset:2px} + +/* Same approved v9 physical OFF shadow as the source strip. */ +.app .console-body .strip .mx-sof-tap-key[data-tap-visual="pre"]::before{ + filter:drop-shadow(0 .8px 1.15px rgba(0,0,0,.42)) drop-shadow(0 1.7px 2.1px rgba(0,0,0,.32)); +} diff --git a/site/preview-v2/assets/mixer-section-controls.css b/site/preview-v2/assets/mixer-section-controls.css index 9131ee6e4..892977feb 100644 --- a/site/preview-v2/assets/mixer-section-controls.css +++ b/site/preview-v2/assets/mixer-section-controls.css @@ -78,3 +78,90 @@ @media(max-width:900px){.command-bar{padding:0 5px;gap:4px}.command-bar .toolbar-label{display:none}.command-bar .tool{padding:4px 6px}.command-bar .toolbar-select{max-width:86px}.command-bar .sep{margin:0 1px}} + + +/* Contextual console views. One existing FX cell, no extra strip height. + All expensive effects/graph state stays mounted on the native side. */ +.command-bar .strip-view-switch{ + display:inline-flex;align-items:center;flex:none;border:1px solid #53656c; + border-radius:3px;overflow:hidden;background:#172833;height:28px; +} +.command-bar .strip-view-switch .tool{ + min-height:26px;height:26px;padding:3px 9px;border:0;border-radius:0; + font-size:10px;letter-spacing:.015em;background:transparent;color:#b9ced6; +} +.command-bar .strip-view-switch .tool+.tool{border-left:1px solid #4a5b65} +.command-bar .strip-view-switch .tool[aria-pressed="true"]{ + color:#eff9fa;background:#365765;box-shadow:inset 0 -2px #7ec5d4; +} +.command-bar .strip-view-switch .tool:disabled{opacity:.65;cursor:default} +.command-bar .mix-context{ + display:inline-flex;align-items:center;min-width:0;margin-left:9px; + padding:2px 7px;border:1px solid #435c69;border-radius:2px; + color:#9acbd9;background:#182c37;font-size:10px;font-weight:500; + letter-spacing:.03em;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; +} +.command-bar:has(#sofToggle[aria-pressed="true"]) #sofToggle{ + color:#e7f6f5;background:#2b5760;border-color:#6a9aa6; +} +.console-body .strip .fx-section.is-gain-view, +.console-body .strip .fx-section.is-sof-view{ + display:flex;flex-direction:column;min-height:0;overflow:hidden; + background:linear-gradient(180deg,#21343d,#172832); +} +.console-body .strip .gain-view-body{ + min-height:0;flex:1;display:flex;flex-direction:column; + justify-content:center;align-items:center;gap:2px;padding:2px 2px 4px; +} +.console-body .strip .gain-dial{ + position:relative;display:block;flex:0 0 39px;width:39px;height:39px; + border-radius:50%;cursor:ns-resize; +} +.console-body .strip .gain-dial-face{ + display:block;position:absolute;inset:2px;border:2px solid #5c747f; + border-radius:50%;background:radial-gradient(circle at 38% 31%,#617480,#273842 65%,#15242b); + box-shadow:inset 0 1px #9aafb844,0 2px 3px #0007; +} +.console-body .strip .gain-dial-face::after{ + content:"";position:absolute;left:50%;top:4px;width:2px;height:10px; + border-radius:2px;background:#d2ecf3;box-shadow:0 0 1px #fff8; + transform-origin:1px 12px;transform:translateX(-50%) rotate(var(--gain-rotation,0deg)); +} +.console-body .strip .gain-dial input{ + position:absolute;inset:0;width:100%;height:100%;margin:0;opacity:0; + cursor:ns-resize;writing-mode:vertical-lr;direction:rtl; +} +.console-body .strip .gain-dial:focus-within{outline:2px solid #7ebccf;outline-offset:1px} +.console-body .strip .gain-readout{ + display:block;text-align:center;font-size:10px;line-height:15px; + min-width:65px;max-width:100%;padding:0 4px;border-radius:2px; + background:#102530;border:1px solid #3c606e;color:#b9e8f3; + font-variant-numeric:tabular-nums;font-weight:500;white-space:nowrap; +} +.console-body .strip .sof-view-body{ + flex:1;display:flex;align-items:center;justify-content:space-between; + min-height:0;gap:4px;padding:4px 4px 5px; +} +.console-body .strip .sof-info{display:flex;flex-direction:column;min-width:0;gap:3px} +.console-body .strip .sof-badge{ + color:#c1e5ed;font-size:9px;font-weight:500;white-space:nowrap; + overflow:hidden;text-overflow:ellipsis; +} +.console-body .strip .sof-info small{ + font-size:9px;color:#91b3c0;max-width:100%;white-space:nowrap; + overflow:hidden;text-overflow:ellipsis; +} +.console-body.sends-mode .strip.audio .fader-head{ + background:#173844;border-bottom:1px solid #507481; +} +.console-body.sends-mode .strip.audio .fader-readout{color:#b3e6ef} +.console-body.sends-mode .strip.audio .fader:disabled{opacity:.42;cursor:not-allowed} +@media(max-width:900px){ + .command-bar .strip-view-switch .tool{padding:3px 5px;font-size:9px} + .command-bar .mix-context{padding:2px 4px} +} +@media(max-height:610px){ + .console-body .strip .gain-dial{flex-basis:28px;width:28px;height:28px} + .console-body .strip .gain-dial-face::after{height:7px;transform-origin:1px 9px} + .console-body .strip .sof-info small{display:none} +} diff --git a/site/preview-v2/index.html b/site/preview-v2/index.html index 4df87e2ae..aed78e3d3 100644 --- a/site/preview-v2/index.html +++ b/site/preview-v2/index.html @@ -42,8 +42,15 @@ + STRIP +
+ + +
+ + MAIN MIX @@ -201,7 +208,7 @@ }));}catch(error){/* Manager still works without browser storage. */} } const tracksEl=document.getElementById('tracks'),masterEl=document.getElementById('master'),info=document.getElementById('info'); -let nextId=1,nextGroup=1,tracks=[],master,preview=false,meterFrame=0,lastTick=0,clipboard=null,scenes=[],sofEnabled=false,sofTarget="Bus A",wireSourceId=1,wireEdges=[],nextWireId=1,selectedWireEdgeId=null,wireMode='send',wireAnchorId=null,wireHoverId=null,wireGesture=null,wireSuppressClick=false,pendingBusRoute=null,wireView='focus',wireSourcePinned=false,wireIntent=false; +let nextId=1,nextGroup=1,tracks=[],master,preview=false,meterFrame=0,lastTick=0,clipboard=null,scenes=[],stripView="fx",sofEnabled=false,sofTarget="Bus A",wireSourceId=1,wireEdges=[],nextWireId=1,selectedWireEdgeId=null,wireMode='send',wireAnchorId=null,wireHoverId=null,wireGesture=null,wireSuppressClick=false,pendingBusRoute=null,wireView='focus',wireSourcePinned=false,wireIntent=false; const clone=x=>JSON.parse(JSON.stringify(x)); const selection=()=>tracks.concat(master).filter(t=>t.selected); const make=(name,kind,color)=>{ @@ -321,7 +328,38 @@ say(t.name+' · FX reorder undone · GUI reference'); return true; } + +/* UI context only; FX/DSP slots remain in the session when the rack is hidden. */ +function sectionGain(t){ + const value=Math.max(-24,Math.min(24,Number(t.trim)||0)); + const nativeUnavailable=!!window.__JUCE__?.backend; + return '
'+ + 'GINPUT GAIN
'+ + '
'+ + ''+(nativeUnavailable?'NATIVE PENDING':formatDb(value)+' dB')+'
'; +} +/* SOF is a contextual UI view of an explicit existing EdgeId, not a new graph. */ +function sectionSof(t){ + const dest=tracks.find(x=>x.name===sofTarget&&(x.kind==='bus'||x.kind==='fx')); + const edge=dest?wireFor(t.id,dest.id):null; + const editable=!!edge&&edge.kind==='send'&&!window.__JUCE__?.backend; + const visual=!edge||edge.kind!=='send'?'idle':edge.mode==='split'?'pre':'post'; + const badge=!edge?'NOT PATCHED':edge.kind!=='send'?'PRIMARY ROUTE': + edge.mode==='split'?'PRE-FX':'POST-FADER'; + const status=!edge?'Patch with WIRE first':edge.kind!=='send'?'Not a parallel SEND': + 'SEND LEVEL '+wireDbText(edge.levelDb); + return '
'+ + '
↗SEND TO '+escapeHtml(sofTarget||'—')+'
'+ + '
'+badge+''+ + ''+escapeHtml(status)+'
'+ + '
'; +} function sectionFx(t){ + if(sofEnabled&&t.kind==='audio')return sectionSof(t); + if(stripView==='gain'&&t.kind==='audio')return sectionGain(t); ensureFxInsertIds(t); const used=t.fx.map((name,i)=>({name,i})).filter(x=>x.name!=='None'); const first=t.fx.findIndex(x=>x==='None'); @@ -684,7 +722,7 @@ return '
'+(isSend?'SEND ':'')+formatDb(value)+' dB
' +'
' +'
'+(t.format==='mono'?'':'
')+'
'+vuScale+'
' - +'
' + +'
' +'
'+gainScale+'
'; } function strip(t){ @@ -718,10 +756,10 @@ tapMode==='mixed'?'Mixed PRE and POST parallel WIRE sends · click to set all POST': (tapMode==='send'?'POST follows channel fader':'PRE independent before FX')+ ' · '+parallelSends.length+' outgoing parallel SEND(s), primary MAIN unchanged'; - code+='
' + code+='
' +'' +''; - if(t.kind!=='master')code+=''; + if(t.kind!=='master'&&!sofEnabled)code+=''; code+='
'; code+=sectionFader(t); code+='
'+(sofEnabled&&t.kind==='audio'?'S ': '')+formatDb(sofEnabled&&t.kind==='audio'?getSofLevel(t):t.level)+'
'; @@ -768,6 +806,14 @@ meterObserver?.disconnect();meterGeometry=new WeakMap(); tracksEl.innerHTML=bankTracks.map(strip).join(''); updateSofTargets(); + const gainBtn=document.getElementById('gainView'),fxBtn=document.getElementById('fxView'); + for(const [button,value] of [[gainBtn,'gain'],[fxBtn,'fx']]){ + button.disabled=sofEnabled; + button.setAttribute('aria-pressed',String(stripView===value&&!sofEnabled)); + button.classList.toggle('active',stripView===value&&!sofEnabled); + } + const context=document.getElementById('mixContext'); + if(context)context.textContent=sofEnabled?'SEND MIX → '+sofTarget:'MAIN MIX'; masterEl.innerHTML=strip(master); document.getElementById('viewport').scrollLeft=0; document.getElementById('bankPrev').disabled=count<=1; @@ -813,19 +859,20 @@ if(el.innerHTML!==html)el.innerHTML=html;el.value=sofTarget; } function getSofIndex(t){return t.sendSlots.findIndex((slot,i)=>(i===t.activeSend?t.send:slot.send)===sofTarget);} -function getSofLevel(t){const dest=tracks.find(x=>x.name===sofTarget); - const edge=dest&&wireFor(t.id,dest.id);return edge?edge.levelDb:-60;} +function getSofEdge(t){ + const dest=tracks.find(x=>x.name===sofTarget&&(x.kind==='bus'||x.kind==='fx')); + const edge=dest&&wireFor(t.id,dest.id); + return edge&&edge.kind==='send'?edge:null; +} +function getSofLevel(t){const edge=getSofEdge(t);return edge?edge.levelDb:-60;} function setSofLevel(t,newLevel){ const dest=tracks.find(x=>x.name===sofTarget&&x.id!==t.id); if(!dest||t.kind==='master')return false; const level=Math.round(Math.max(-60,Math.min(6,newLevel))*10)/10; - const edge=wireFor(t.id,dest.id); - if(!edge&&level<=-60)return true; - const ops=level<=-60?[{type:'REMOVE',sourceId:t.id,edgeId:edge.id}]: - edge?[{type:'GAIN',sourceId:t.id,edgeId:edge.id,levelDb:level}]: - [{type:'CONNECT',sourceId:t.id,destId:dest.id}, - {type:'GAIN',sourceId:t.id,edgeId:nextWireId,levelDb:level}]; - return wireGraphCommit(ops,{record:false}); + const edge=getSofEdge(t); + // Never auto-patch or remove a WIRE at minimum send level. + if(!edge)return false; + return wireGraphCommit([{type:'GAIN',sourceId:t.id,edgeId:edge.id,levelDb:level}],{record:false}); } function toggleSof(force){ sofEnabled=typeof force==='boolean'?force:!sofEnabled; @@ -1794,7 +1841,16 @@ if(label)label.textContent=panLabel(value); if(event.type==='change')say(t.name+' pan '+panLabel(value)); } - else if(field==='trim'){t.trim=Number(el.value);if(el.style?.setProperty)el.style.setProperty('--range-pct',rangePct(t.trim,-24,24)+'%');const readout=el.closest('.trim-section')?.querySelector('.trim-value');if(readout)readout.textContent=formatDb(t.trim);if(event.type==='change')say(t.name+' digital trim '+formatDb(t.trim)+' dB');} + else if(field==='trim'){ + if(window.__JUCE__?.backend){say('Native digital gain not admitted');return;} + t.trim=Math.max(-24,Math.min(24,Math.round(Number(el.value)*10)/10)); + if(el.style?.setProperty)el.style.setProperty('--range-pct',rangePct(t.trim,-24,24)+'%'); + const section=el.closest('.gain-view-body,.trim-section'); + const readout=section?.querySelector('.gain-readout,.trim-value'); + if(readout)readout.textContent=formatDb(t.trim)+' dB'; + section?.querySelector('.gain-dial')?.style.setProperty('--gain-rotation',(t.trim*5.625).toFixed(2)+'deg'); + if(event.type==='change')say(t.name+' digital trim '+formatDb(t.trim)+' dB · reference only'); + } else if(field==='sendLevel'){t.sendLevel=Number(el.value);if(el.style?.setProperty)el.style.setProperty('--range-pct',rangePct(t.sendLevel,-60,6)+'%');el.nextElementSibling.textContent=formatDb(t.sendLevel);} else if(field==='sendPan'){t.sendPan=Number(el.value);el.nextElementSibling.textContent=t.sendPan===0?'C':t.sendPan<0?'L'+Math.abs(t.sendPan):'R'+t.sendPan;} else if(field==='activeSend'){const slot=Number(el.value.slice(1))-1;if(slot<0||slot>=16)return;openSendSlot(t,slot);refreshStrip(t);say(t.name+' · selected Send '+(slot+1));return;} @@ -2032,6 +2088,17 @@ if(a==='openPlugin'){openFastPicker(t,Number(btn.dataset.slot),btn);return;} if(a==='removeFx'){if(deferNativeFxIntent('Remove FX insert'))return;const i=Number(btn.dataset.slot);t.fx[i]='None';t.slotBypass[i]=false;if(t.fxInsertIds)t.fxInsertIds[i]=null;fxReorderUndo=null;refreshStrip(t);say(t.name+' · cleared FX insert '+(i+1));return;} if(a==='slotPower'){if(deferNativeFxIntent('FX insert bypass'))return;const slot=Number(btn.dataset.slot);if(t.fx[slot]==='None'){say(t.name+': choose an effect before toggling bypass');return;}t.slotBypass[slot]=!t.slotBypass[slot];refreshStrip(t);say(t.name+': FX '+(slot+1)+(t.slotBypass[slot]?' bypassed':' enabled'));return;} + if(a==='sofTap'){ + if(!sofEnabled||t.kind!=='audio')return; + if(window.__JUCE__?.backend){say('Native WIRE tap change requires PCM ACK');return;} + const edge=getSofEdge(t); + if(!edge){say('Connect a parallel WIRE to '+sofTarget+' before changing its tap');return;} + const next=edge.mode==='split'?'send':'split'; + if(!wireGraphCommit([{type:'MODE',sourceId:t.id,edgeId:edge.id,mode:next}]))return; + refreshStrip(t); + say(t.name+' → '+sofTarget+' · '+(next==='split'?'PRE-FX':'POST-FADER')+' · reference graph'); + return; + } if(a==='tapMode'){ if(t.kind==='master')return; // PRE/POST is a structural native DSP tap change, NOT a cosmetic button. @@ -2042,10 +2109,11 @@ return; } const sends=wireEdges.filter(edge=>edge.enabled&&edge.sourceId===t.id&&edge.kind==='send'&&edge.destId!==master.id); - // Mixed taps resolve predictably to POST on first click; next click selects PRE. - const allPost=sends.length>0&&sends.every(edge=>edge.mode==='send'); - const next=sends.length?(allPost?'split':'send'):(t.wireTapMode==='split'?'send':'split'); - if(sends.length&&!wireGraphCommit(sends.map(edge=>({type:'MODE',sourceId:t.id,edgeId:edge.id,mode:next}))))return; + // MIX status is not permission to rewrite all parallel connections. + const selected=sends.find(edge=>edge.id===selectedWireEdgeId)||(sends.length===1?sends[0]:null); + if(sends.length>1&&!selected){say('Select a specific WIRE before changing its tap');return;} + const next=selected?(selected.mode==='send'?'split':'send'):(t.wireTapMode==='split'?'send':'split'); + if(selected&&!wireGraphCommit([{type:'MODE',sourceId:t.id,edgeId:selected.id,mode:next}]))return; t.wireTapMode=next; if(wireSourceId===t.id){wireMode=next;document.getElementById('wireMode').value=next;} refreshStrip(t);selectTrack(t); @@ -2549,6 +2617,14 @@ document.getElementById('routeParallel').addEventListener('click',()=>commitRouteChoice('parallel')); document.getElementById('routeChoiceClose').addEventListener('click',closeRouteChoice); document.getElementById('wireMaster').addEventListener('click',toggleDirectMain); +for(const [id,value] of [['gainView','gain'],['fxView','fx']]){ + document.getElementById(id).addEventListener('click',()=>{ + if(sofEnabled)return; + if(value==='gain'&&window.__JUCE__?.backend){say('Native input gain requires accepted DSP control');return;} + stripView=value;render(); + say(value==='gain'?'Digital INPUT GAIN view · preview trim only':'FX RACK view · existing inserts preserved'); + }); +} document.getElementById('sofToggle').addEventListener('click',()=>toggleSof()); document.getElementById('sofTarget').addEventListener('change',()=>{sofTarget=document.getElementById('sofTarget').value;render();say('Sends target: '+sofTarget);}); document.getElementById('addTrack').addEventListener('click',()=>{ diff --git a/tests/approved_css_stage_d_single_bundle_smoke.py b/tests/approved_css_stage_d_single_bundle_smoke.py index fdf5daad2..a97a99924 100644 --- a/tests/approved_css_stage_d_single_bundle_smoke.py +++ b/tests/approved_css_stage_d_single_bundle_smoke.py @@ -94,7 +94,7 @@ async def main(): assert await tap.get_attribute("data-tap-visual")=="mixed", "Mixed sends must have honest MIX artwork" assert await tap.get_attribute("aria-pressed")=="mixed" await tap.click() - assert await page.locator("#tracks .strip[data-id='1'] [data-hw-kind='tap']").get_attribute("data-tap-visual")=="post", "MIX click must retarget sends to POST" + assert await page.locator("#tracks .strip[data-id='1'] [data-hw-kind='tap']").get_attribute("data-tap-visual")=="mixed", "MIX click with ambiguous sends must preserve distinct EdgeId tap settings" assert "arsonmix-approved-runtime.css?sha=" in stats["links"][0] assert len(css_requests) == 1, (size,css_requests) assert not errors, errors diff --git a/tests/pages_png_buttons_wire_reconciliation_smoke.py b/tests/pages_png_buttons_wire_reconciliation_smoke.py index 4fd086c2e..52fbb4e92 100644 --- a/tests/pages_png_buttons_wire_reconciliation_smoke.py +++ b/tests/pages_png_buttons_wire_reconciliation_smoke.py @@ -156,7 +156,7 @@ def states(): page.locator('.section-rail [data-section="send"]').click() page.locator('#tracks .strip[data-id="1"] .wire-node-out').click() page.locator('#tracks .strip[data-id="3"] .wire-node-in').click() - assert page.locator('#tracks .strip[data-id="1"] [data-tap-visual="post"]').count()==1 + assert page.locator('#tracks .strip[data-id="1"] [data-tap-visual="mixed"]').count()==1, "Ambiguous MIX click must not overwrite independent sends" page.locator('#wireConfigToggle').click() page.locator('#wireMode').select_option('split') page.locator('#wireConfigClose').click() @@ -180,7 +180,7 @@ def main(): cwd=ROOT,check=True,capture_output=True,text=True) verify_bundle(dist) verify_browser(dist) - print("PASS: Harmonice v8 truthful idle PRE/POST PNG, hidden PFL, no MASTER tap, stable MUTE/SOLO and WIRE") + print("PASS: Harmonice v9 truthful idle PRE/POST PNG, hidden PFL, no MASTER tap, stable MUTE/SOLO and WIRE") if __name__=="__main__": main() diff --git a/tests/sof_contextual_console_smoke.py b/tests/sof_contextual_console_smoke.py new file mode 100644 index 000000000..a50a0417f --- /dev/null +++ b/tests/sof_contextual_console_smoke.py @@ -0,0 +1,116 @@ +"""Contextual Gain/FX Rack and Sends-on-Faders public GUI smoke. + +Runs against the single *assembled* /preview/ renderer. All control checks +below are browser-reference only, not claims of native ASIO/PCM admission. +No direct engine/graph mutation in this fixture. +""" +from __future__ import annotations + +import subprocess +import sys +import tempfile +from pathlib import Path + +from playwright.sync_api import sync_playwright + +ROOT = Path(__file__).resolve().parents[1] + + +def run() -> None: + with tempfile.TemporaryDirectory(prefix="arsonmix-sof-context-") as tmp: + dist = Path(tmp) / "pages" + subprocess.run( + [ + sys.executable, + str(ROOT / "scripts/build_pages.py"), + "--out", str(dist), + "--sha", "sof-context-test", + "--branch", "gui-test", + ], + cwd=ROOT, check=True, capture_output=True, text=True, + ) + html = dist / "preview" / "index.html" + source = html.read_text(encoding="utf-8") + assert 'id="gainView"' in source and 'id="fxView"' in source + assert 'id="mixContext"' in source + assert "Never auto-patch or remove a WIRE at minimum send level." in source + with sync_playwright() as p: + browser = p.chromium.launch(headless=True) + try: + for width, height in ((1366, 768), (1680, 900), (1920, 1080)): + page = browser.new_page(viewport={"width": width, "height": height}) + errors = [] + page.on("pageerror", lambda err: errors.append(str(err))) + page.goto(html.as_uri()) + first = page.locator('#tracks .strip[data-id="1"]') + first.wait_for(timeout=15000) + gain = page.locator("#gainView") + fx = page.locator("#fxView") + assert gain.get_attribute("aria-pressed") == "false" + assert fx.get_attribute("aria-pressed") == "true" + assert page.locator("#mixContext").inner_text() == "MAIN MIX" + + # The same cell swaps only its presentation, not FX state. + gain.click() + assert gain.get_attribute("aria-pressed") == "true" + assert first.locator(".is-gain-view").count() == 1 + knob = first.locator('[data-field="trim"]') + assert knob.count() == 1 + knob.evaluate("""el => { + el.value = '6.5'; + el.dispatchEvent(new Event('input', {bubbles:true})); + }""") + assert "+6.5 dB" in first.locator(".gain-readout").inner_text() + assert "6.5" in knob.get_attribute("value") or knob.input_value() == "6.5" + + fx.click() + assert first.locator(".is-gain-view").count() == 0 + assert first.locator(".fxslot-list").count() == 1 + + # Enter SENDS: the approved strip and pinned master survive. + page.locator("#sofToggle").click() + assert page.locator("#mixContext").inner_text().startswith("SEND MIX") + assert gain.is_disabled() and fx.is_disabled() + assert first.locator(".is-sof-view").count() == 1 + assert first.locator(".mx-sof-tap-key").count() == 1 + assert first.locator('button[data-hw-kind="tap"]').count() == 0 + assert first.locator('button[data-hw-kind="mute"]').count() == 1 + assert first.locator('button[data-hw-kind="solo"]').count() == 1 + assert first.locator(".fader").is_disabled(), ( + "A missing WIRE must not turn a fader gesture into auto-patch") + assert page.locator("#master .strip").count() == 1 + assert page.locator("#wireLayer").count() == 1 + + # SENDS mode exposes approved raster, not a fake CSS key. + tap = first.locator(".mx-sof-tap-key") + sprite = tap.evaluate( + "el => getComputedStyle(el, '::before').backgroundImage") + assert "harmonice-thin-flat-v9-approved-off-shadow-57x30.png" in sprite, sprite + assert tap.is_disabled() + + # Keep FX slots/trim values when returning from SENDS. + page.locator("#sofToggle").click() + assert page.locator("#mixContext").inner_text() == "MAIN MIX" + gain.click() + assert "+6.5 dB" in first.locator(".gain-readout").inner_text() + + # Every visible cell remains in its strip bounds. + geometry = first.locator(".gain-view-body").evaluate("""el => { + const a=el.getBoundingClientRect(), + b=el.closest('.fx-section').getBoundingClientRect(); + return {left:a.left, right:a.right, top:a.top, bottom:a.bottom, + sectionLeft:b.left, sectionRight:b.right, + sectionTop:b.top, sectionBottom:b.bottom}; + }""") + assert geometry["left"] >= geometry["sectionLeft"] - 2 + assert geometry["right"] <= geometry["sectionRight"] + 2 + assert geometry["bottom"] <= geometry["sectionBottom"] + 2 + assert not errors, (width, errors) + page.close() + finally: + browser.close() + print("PASS SOF contextual strip view, PNG, WIRE guard, Gain/FX interlock at 3 resolutions") + + +if __name__ == "__main__": + run() diff --git a/web/approved-native-bridge.js b/web/approved-native-bridge.js index c5692a29f..5cfe65df8 100644 --- a/web/approved-native-bridge.js +++ b/web/approved-native-bridge.js @@ -3793,6 +3793,7 @@ // shortcuts instead of silently intercepting and leaving broken buttons. const nativeReferenceOnly=Object.freeze({ sceneSelect:"Native full-session Show is not yet available", + gainView:"Digital input gain requires acknowledged native ChannelId gain and PCM", sofToggle:"Sends on Faders requires acknowledged native send-gain routing", sofTarget:"Sends on Faders requires acknowledged native send-gain routing", saveScene:"Native full-session Show is not yet available",