rig-review 4.3.0 → 4.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rig-review",
3
- "version": "4.3.0",
3
+ "version": "4.4.0",
4
4
  "type": "module",
5
5
  "description": "Local human rig inspection and structured feedback export",
6
6
  "license": "MIT",
package/src/job-front.ts CHANGED
@@ -188,7 +188,8 @@ export function createJobFront(options: {
188
188
  });
189
189
  return new Response(body, { headers: { ...headers, 'Content-Type': 'application/x-ndjson' } });
190
190
  }
191
- if (url.search && !(route === '' && ['?lang=en', '?lang=ko'].includes(url.search))) {
191
+ const partsDifferenceQuery = /^publications\/[A-Za-z0-9][A-Za-z0-9._-]{0,127}\/instances\/[a-f0-9]{64}\/api\/stage-parts\/difference\/(0|[1-9]\d*)$/.test(route);
192
+ if (url.search && !partsDifferenceQuery && !(route === '' && ['?lang=en', '?lang=ko'].includes(url.search))) {
192
193
  return failure('JOB_REQUEST_INVALID', 400);
193
194
  }
194
195
  const instance = /^publications\/([A-Za-z0-9][A-Za-z0-9._-]{0,127})\/instances\/([a-f0-9]{64})\/(.*)$/.exec(route);
@@ -436,8 +437,14 @@ export function retainedPublicationRoutes(session: JobSession) {
436
437
  if(difference&&parts){
437
438
  const url=new URL(request.url),threshold=url.searchParams.get('threshold'),footprints=url.searchParams.get('footprints');
438
439
  if(!threshold||!/^\d{1,3}$/.test(threshold)||!['true','false'].includes(footprints??''))return failure('JOB_REQUEST_INVALID',400);
439
- const raster=await partsDifference(parts,Number(difference[1]),Number(threshold),footprints==='true'),png=new PNG({width:raster.width,height:raster.height});png.data=Buffer.from(raster.data);
440
- return new Response(request.method==='HEAD'?null:new Uint8Array(PNG.sync.write(png)),{headers:{...headers,'Content-Type':'image/png','X-Difference-Count':String(raster.count),'X-Difference-Covered':String(raster.covered),'X-Difference-Compared':String(raster.compared)}});
440
+ try {
441
+ const raster=await partsDifference(parts,Number(difference[1]),Number(threshold),footprints==='true'),png=new PNG({width:raster.width,height:raster.height});png.data=Buffer.from(raster.data);
442
+ return new Response(request.method==='HEAD'?null:new Uint8Array(PNG.sync.write(png)),{headers:{...headers,'Content-Type':'image/png','X-Difference-Count':String(raster.count),'X-Difference-Covered':String(raster.covered),'X-Difference-Compared':String(raster.compared)}});
443
+ } catch (error) {
444
+ const code = error instanceof Error ? /^(PARTS_DIFFERENCE_UNAVAILABLE|PARTS_DIFFERENCE_PNG):/.exec(error.message)?.[1] : undefined;
445
+ if (code) return failure(code, 400);
446
+ throw error;
447
+ }
441
448
  }
442
449
  const part = /^api\/stage-parts\/(image|page)\/(0|[1-9]\d*)$/.exec(path);
443
450
  if (part && parts) {
package/src/parts-view.ts CHANGED
@@ -1130,10 +1130,9 @@ export async function partsDifference(pkg: PartsViewPackage, index: number, thre
1130
1130
  }
1131
1131
  const decode = async (path: string) => {
1132
1132
  const bytes = await readFile(path);
1133
- if (bytes[24] !== 8 || bytes[25] !== 6) {
1134
- refuse('PARTS_DIFFERENCE_PNG', 'exact RGBA8 operands required');
1135
- }
1136
- return PNG.sync.read(bytes);
1133
+ // pngjs normalizes valid PNG colour types and bit depths from the bound bytes.
1134
+ try { return PNG.sync.read(bytes); }
1135
+ catch { return refuse('PARTS_DIFFERENCE_PNG', 'decodable PNG operands required'); }
1137
1136
  };
1138
1137
  const painting = await decode(pkg.paintingInRig!.abs);
1139
1138
  const part = await decode(pkg.imagePaths[index]!);
package/web/catalog-en.ts CHANGED
@@ -175,6 +175,9 @@ export const enCatalog: Readonly<Record<string, string>> = {
175
175
  "PARTS_DIFFERENCE_UNAVAILABLE: declared painting_in_rig required; legacy records remain readable": "PARTS_DIFFERENCE_UNAVAILABLE: declared painting_in_rig required; legacy records remain readable",
176
176
  "PARTS_DIFFERENCE_UNAVAILABLE: known original part required": "PARTS_DIFFERENCE_UNAVAILABLE: known original part required",
177
177
  "PARTS_DIFFERENCE_PNG: exact RGBA8 operands required": "PARTS_DIFFERENCE_PNG: exact RGBA8 operands required",
178
+ "PARTS_DIFFERENCE_PNG: decodable PNG operands required": "PARTS_DIFFERENCE_PNG: decodable PNG operands required",
179
+ "PARTS_DIFFERENCE_PNG": "PARTS_DIFFERENCE_PNG",
180
+ "PARTS_DIFFERENCE_UNAVAILABLE": "PARTS_DIFFERENCE_UNAVAILABLE",
178
181
  "PARTS_DIFFERENCE_ALIGNMENT: integer native placement and exact PNG dimensions required": "PARTS_DIFFERENCE_ALIGNMENT: integer native placement and exact PNG dimensions required",
179
182
  "PARTS_DIFFERENCE_ALIGNMENT: nontransparent part pixel lies outside declared rig grid": "PARTS_DIFFERENCE_ALIGNMENT: nontransparent part pixel lies outside declared rig grid",
180
183
  "PARTS_COMPARISON_INVALID: part/overlay with opacity 0..1, or difference with integer threshold 0..255 required": "PARTS_COMPARISON_INVALID: part/overlay with opacity 0..1, or difference with integer threshold 0..255 required",
package/web/catalog-ko.ts CHANGED
@@ -175,6 +175,9 @@ export const koCatalog: Readonly<Record<string, string>> = {
175
175
  "PARTS_DIFFERENCE_UNAVAILABLE: declared painting_in_rig required; legacy records remain readable": "PARTS_DIFFERENCE_UNAVAILABLE: 차이 비교에는 선언된 painting_in_rig가 필요해요. 이전 기록은 계속 열 수 있어요.",
176
176
  "PARTS_DIFFERENCE_UNAVAILABLE: known original part required": "PARTS_DIFFERENCE_UNAVAILABLE: 패키지에 등록된 원본 파트가 필요해요.",
177
177
  "PARTS_DIFFERENCE_PNG: exact RGBA8 operands required": "PARTS_DIFFERENCE_PNG: 비교에 쓰는 이미지는 RGBA8이어야 해요.",
178
+ "PARTS_DIFFERENCE_PNG: decodable PNG operands required": "PARTS_DIFFERENCE_PNG: 비교에 쓰는 PNG 이미지를 읽을 수 있어야 해요.",
179
+ "PARTS_DIFFERENCE_PNG": "PARTS_DIFFERENCE_PNG",
180
+ "PARTS_DIFFERENCE_UNAVAILABLE": "PARTS_DIFFERENCE_UNAVAILABLE",
178
181
  "PARTS_DIFFERENCE_ALIGNMENT: integer native placement and exact PNG dimensions required": "PARTS_DIFFERENCE_ALIGNMENT: 원본 배치 좌표가 정수이고 PNG 크기가 선언된 크기와 정확히 같아야 해요.",
179
182
  "PARTS_DIFFERENCE_ALIGNMENT: nontransparent part pixel lies outside declared rig grid": "PARTS_DIFFERENCE_ALIGNMENT: 파트의 알파가 0보다 큰 픽셀이 선언된 리그 격자 밖에 있어요.",
180
183
  "PARTS_COMPARISON_INVALID: part/overlay with opacity 0..1, or difference with integer threshold 0..255 required": "PARTS_COMPARISON_INVALID: 파트 또는 오버레이의 불투명도는 0~1이어야 하고, 차이 비교의 임계값은 0~255 사이 정수여야 해요.",
package/web/compare.ts CHANGED
@@ -438,7 +438,7 @@ function bind(): void {
438
438
  // #331: a plain drag on either rig pans and carries both rigs, each by its own root scale, so A and B take the same
439
439
  // stimulus; the reference pane only pans, as the Family viewer's does.
440
440
  const carryBoth={threshold:CLICK_SLOP_PX,move:(dx:number,dy:number)=>{for(const side of ['a','b'] as const){const impulse=dragImpulse(dx,dy,rigScales[side]);if(impulse)players[side]?.moved(impulse);}}};
441
- viewDisposers.push(viewport.bindNavigation(target=>target==='reference'?undefined:carryBoth,()=>!comments?.active()));
441
+ viewDisposers.push(viewport.bindNavigation(target=>target==='reference'?undefined:carryBoth,panOnly=>!comments?.active()||!!panOnly));
442
442
  for(const [id,key] of [['layer-images','images'],['layer-mesh','mesh'],['layer-bones','bones']] as const)input(id).onchange=()=>{layers[key]=input(id).checked;redrawOverlays(false);};
443
443
  input('idle-repeat').onchange=()=>{renderIdle();if(canRepeatIdle())void playComparison().catch(error=>message(describe(error),true));};
444
444
  el('inspector-feedback').addEventListener('focusin',()=>{idleHeld=true;const current=lastPresented?.time;stop();if(current!==undefined&&!seeking)void seekTo(current);});
package/web/main.ts CHANGED
@@ -386,7 +386,7 @@ function renderCheckpoint(): void {
386
386
  }
387
387
 
388
388
  function setView(value: typeof view): void {view=value;renderLayout();}
389
- function chooseInspectionView(id:string):void {
389
+ async function chooseInspectionView(id:string):Promise<void> {
390
390
  if(activeInterviewImages){const image=activeInterviewImages[Number(id.replace('interview-image-',''))];if(id.startsWith('interview-image-')&&image){activeInterviewImage=image;void showReference('',image);}return;}
391
391
  if(!partsSubject){
392
392
  if(id==='difference'){
@@ -407,8 +407,9 @@ function chooseInspectionView(id:string):void {
407
407
  return;
408
408
  }
409
409
  const overlay=document.getElementById('parts-overlay') as HTMLInputElement;
410
+ const subject=partsSubject;
411
+ if(!await subject.setComparison(id==='difference'?'difference':overlay.checked?'overlay':'part')||partsSubject!==subject)return;
410
412
  if(id==='difference')overlay.checked=false;
411
- partsSubject.setComparison(id==='difference'?'difference':overlay.checked?'overlay':'part');
412
413
  setView(id==='difference'?'rig':id as SingleLayout);
413
414
  }
414
415
  /** Availability follows the actual loaded image and declared native rig canvas, never a resized reference. */
@@ -1251,7 +1252,7 @@ function bind(): void {
1251
1252
  retargetPanel=bindRetargetPanel({apply:body=>applyRetarget(body),reset:()=>{void resetRebuild(stageWorld());},seek:seekReading});
1252
1253
  requirementsPanel=bindRequirementsPanel({check:runRequirements,seek:seekReading,animation:()=>animation,slot:()=>parts?.value()?.slot??stageDraftSelection?.slot??null,hash:sha256Hex});
1253
1254
  const tickResize=new ResizeObserver(()=>renderReadingTicks());tickResize.observe(el('transport'));viewDisposers.push(()=>tickResize.disconnect());
1254
- viewDisposers.push(viewport.bindNavigation(rigPanCarry({player:()=>player},viewport.state),()=>!comments?.active()));
1255
+ viewDisposers.push(viewport.bindNavigation(rigPanCarry({player:()=>player},viewport.state),panOnly=>!comments?.active()||!!panOnly));
1255
1256
  for(const [id,key] of [['layer-images','images'],['layer-mesh','mesh'],['layer-bones','bones']] as const)input(id).onchange=()=>{layers[key]=input(id).checked;redrawOverlay(false);};
1256
1257
  viewDisposers.push(bindLayerShortcuts(document));describeLayerToggles(document,el('layer-state').textContent??'');
1257
1258
  input('idle-repeat').onchange=()=>{syncPlayerLoop();renderIdle();if(canRepeatIdle())void playPreview();};
@@ -89,6 +89,8 @@ export function bindPartsSubject(host:{
89
89
  let selected:string|null=null,solo=false,comparison:PartsComparison=defaultPartsComparison(),token=0,disposed=false,busy=false,failed=false;
90
90
  let drawnFrame:{w:number;h:number}|null=null,drawnReferenceFrame:{w:number;h:number}|null=null;
91
91
  let drawnRegion:Box|null=null,drawnSolo=false;
92
+ let drawnComparison:PartsComparison|null=null;
93
+ let drawnNavigation:{selected:string|null;solo:boolean;hidden:string[]}|null=null;
92
94
  let original:Promise<HTMLImageElement>|null=null,comments:ReturnType<typeof bindStageComments<CommentRow,PartsPose>>|null=null;
93
95
  const makeCanvas=(w:number,h:number)=>Object.assign(document.createElement('canvas'),{width:w,height:h});
94
96
  const item=()=>data.items.find(item=>item.name===selected)??data.items[0]!;
@@ -143,10 +145,14 @@ export function bindPartsSubject(host:{
143
145
  const selectionChanged=drawnRegion?.name!==referenceBox?.name||drawnSolo!==!assembled();
144
146
  drawnRegion=referenceBox;drawnSolo=!assembled();
145
147
  if(reference){host.referenceCanvas.width=reference.width;host.referenceCanvas.height=reference.height;host.referenceCanvas.getContext('2d')!.drawImage(reference,0,0);drawnReferenceFrame={w:reference.width,h:reference.height};}
146
- drawnFrame={w:frame.w,h:frame.h};failed=false;host.drawn({state:'loaded'});host.el('rig-empty').hidden=true;host.el('rig-label').textContent=t(assembled()?'Assembled parts':'Selected part');
148
+ drawnFrame={w:frame.w,h:frame.h};drawnComparison={...comparison};drawnNavigation={selected,solo,hidden:[...hidden]};failed=false;host.drawn({state:'loaded'});host.el('rig-empty').hidden=true;host.el('rig-label').textContent=t(assembled()?'Assembled parts':'Selected part');
147
149
  if(data.painting&&host.viewport.state.cameraSync&&selectionChanged)host.viewport.requestFit();
148
150
  host.viewport.fitCamera();comments?.refresh();
149
- }catch(error){if(!disposed&&navigation===token){failed=true;drawnFrame=null;drawnReferenceFrame=null;host.drawn({state:'failed',reason:error instanceof Error?error.message:'PARTS_PAINT_FAILED'});host.canvas.getContext('2d')?.clearRect(0,0,host.canvas.width,host.canvas.height);host.referenceCanvas.getContext('2d')?.clearRect(0,0,host.referenceCanvas.width,host.referenceCanvas.height);host.message(error instanceof Error?error.message:'PARTS_PAINT_FAILED',true);throw error;}}
151
+ }catch(error){if(!disposed&&navigation===token){
152
+ if(comparison.mode==='difference'&&drawnComparison&&drawnFrame&&drawnNavigation){comparison={...drawnComparison};selected=drawnNavigation.selected;solo=drawnNavigation.solo;hidden.clear();for(const name of drawnNavigation.hidden)hidden.add(name);host.selectionChanged();host.drawn({state:'loaded'});}
153
+ else{failed=true;drawnFrame=null;drawnReferenceFrame=null;host.drawn({state:'failed',reason:error instanceof Error?error.message:'PARTS_PAINT_FAILED'});host.canvas.getContext('2d')?.clearRect(0,0,host.canvas.width,host.canvas.height);host.referenceCanvas.getContext('2d')?.clearRect(0,0,host.referenceCanvas.width,host.referenceCanvas.height);}
154
+ host.message(error instanceof Error?error.message:'PARTS_PAINT_FAILED',true);throw error;
155
+ }}
150
156
  finally{for(const bitmap of bitmaps)bitmap.close();if(navigation===token){busy=false;host.el('stage-layout').setAttribute('aria-busy','false');comments?.refresh();}}
151
157
  }
152
158
  const redraw=()=>{void paint().catch(()=>{});};
@@ -207,7 +213,7 @@ export function bindPartsSubject(host:{
207
213
  select:(name:string|null)=>{selected=name;if(name===null)solo=false;redraw();host.selectionChanged();},isolate:(value:boolean)=>{solo=value;redraw();host.selectionChanged();},
208
214
  show:(name:string,value:boolean)=>{if(value)hidden.delete(name);else hidden.add(name);redraw();},
209
215
  differenceAvailable:()=>data.differenceAvailable&&!!data.painting&&!failed,
210
- comparison:()=>comparison,setComparison:(mode:PartsComparison['mode'])=>{comparison=mode==='difference'?{mode,opacity:comparison.opacity,threshold:0}:{mode,opacity:comparison.opacity};redraw();},
216
+ comparison:()=>comparison,setComparison:async(mode:PartsComparison['mode'])=>{const next:PartsComparison=mode==='difference'?{mode,opacity:comparison.opacity,threshold:0}:{mode,opacity:comparison.opacity};comparison=next;const navigation=token+1;try{await paint();return !disposed&&navigation===token&&comparison===next;}catch{return false;}},
211
217
  opacity:(value:number)=>{comparison.opacity=value;redraw();},paint,redraw,
212
218
  async ready(){if(data.painting)host.viewport.state.cameraSync=true;await paint();},
213
219
  dispose(){disposed=true;++token;comments?.dispose();images.clear();loaded.clear();assemblyAlpha.clear();},
@@ -5,7 +5,7 @@ import type {Feedback} from '../src/session.ts';
5
5
  import type {ControlNumericCamera} from '../src/control.ts';
6
6
  import {drawnSlots,region,projectMark,unprojectMark,parseStageComment,feedbackTimingLabel,type MarkRegion,type MarkPoint,type StageComment} from '../src/stage-comment.ts';
7
7
  import {getLanguage as i18nLang,onLanguageChange as i18nOnChange,t as i18nT,tr as i18nTr} from './i18n.ts';
8
- import {textEntryFocused} from './view-controls.ts';
8
+ import {panSpaceHeld,textEntryFocused} from './view-controls.ts';
9
9
  export interface CommentPose {
10
10
  mode:StageComment['mode'];camera:ControlNumericCamera;frame:StageComment['frame'];timeBasis?:StageComment['timeBasis'];time:number;animation:string|null;
11
11
  turn:unknown;sourceHash:string;modelHash:string|null;referenceHash:string|null;referenceId:string|null;frameReason?:string;
@@ -39,6 +39,7 @@ const t=(s:string)=>typeof i18nT==='function'?i18nT(s):s;
39
39
  const toEn=(s:string)=>typeof i18nTr==='function'?i18nTr(s,'en'):s;
40
40
  const onLang=(fn:()=>void)=>typeof i18nOnChange==='function'?i18nOnChange(fn):()=>{};
41
41
  const curLang=()=>typeof i18nLang==='function'?i18nLang():'en';
42
+ const spaceHeld=()=>typeof panSpaceHeld==='function'&&panSpaceHeld();
42
43
  function rectElement(r:MarkRegion):HTMLDivElement{const node=document.createElement('div');node.className='stage-comment-region';Object.assign(node.style,{left:r.x+'px',top:r.y+'px',width:Math.max(2,r.width)+'px',height:Math.max(2,r.height)+'px'});return node;}
43
44
  async function crop(pose:CommentUiPose,r:MarkRegion):Promise<StageComment['crop']>{
44
45
  if(!pose.capture)throw new Error(t('COMMENT_CROP_UNAVAILABLE: viewport pixel source unavailable'));
@@ -212,7 +213,7 @@ export function bindStageComments<Row extends CommentRow=Feedback,Pose extends C
212
213
  prepared=crop(pose,screen);prepared.catch(()=>{});last='';place();
213
214
  }};
214
215
  }
215
- form.onkeydown=e=>{if(e.key==='Escape'){e.preventDefault();e.stopPropagation();setOpen(false);pane.focus();}};
216
+ form.onkeydown=e=>{if(e.key==='Escape'){e.preventDefault();e.stopPropagation();cancel();renderPins();pane.focus();}};
216
217
  form.onsubmit=async e=>{e.preventDefault();if(busy)return;if(generation!==interaction||view&&host.pose(view)&&host.pose(view!)?.mode!==placementMode){cancel();return;}const summary=field.value.trim();if(!summary){field.focus();return;}try{
217
218
  if(selectedParts && !selectedParts.length)throw new Error(t('Select at least one part.'));
218
219
  if(existing){
@@ -253,7 +254,8 @@ export function bindStageComments<Row extends CommentRow=Feedback,Pose extends C
253
254
  for(const [key,pane]of Object.entries(host.viewports)){
254
255
  const view=key as StageComment['viewport'],local=(e:PointerEvent)=>{const r=pane!.getBoundingClientRect();return {x:Math.max(0,Math.min(pane!.clientWidth,e.clientX-r.left-pane!.clientLeft)),y:Math.max(0,Math.min(pane!.clientHeight,e.clientY-r.top-pane!.clientTop))};};
255
256
  const down=(e:PointerEvent)=>{
256
- if(e.button!==0||!e.isPrimary)return;
257
+ if(e.button!==0||!e.isPrimary||spaceHeld()){if(spaceHeld()&&(e.target as Element)?.closest?.('.stage-comment-pin'))suppressPinClick=true;return;}
258
+ suppressPinClick=false;
257
259
  const target=e.target as Element,pin=host.codec?.geometry?target.closest<HTMLButtonElement>('.stage-comment-pin'):null;
258
260
  const handle=target.closest<HTMLElement>('[data-comment-handle]')?.dataset.commentHandle;
259
261
  if(geometryEdit?.view===view&&handle&&!e.shiftKey){
@@ -288,13 +290,13 @@ export function bindStageComments<Row extends CommentRow=Feedback,Pose extends C
288
290
  if(pinPress?.id===e.pointerId){e.preventDefault();e.stopImmediatePropagation();const pin=pinPress.pin;pinPress=null;if(pane!.hasPointerCapture(e.pointerId))pane!.releasePointerCapture(e.pointerId);pin.click();return;}
289
291
  if(!pending||pending.id!==e.pointerId)return;e.preventDefault();e.stopImmediatePropagation();const p=pending;pending=null;if(pane!.hasPointerCapture(e.pointerId))pane!.releasePointerCapture(e.pointerId);try{await p.settled;assertCapture();if(disposed||interaction!==p.interaction||!enabled)return;const r=Math.hypot(p.end.x-p.start.x,p.end.y-p.start.y)<4?region(p.start,p.start):region(p.start,p.end);openComposer(view,r,undefined,p.mode);}catch(error){host.error(String(error));cancel();}};
290
292
  const abort=(e:PointerEvent)=>{if(pending?.view===view&&pending.id===e.pointerId||geometryDrag?.id===e.pointerId||pinPress?.id===e.pointerId)cancel();};
291
- const suppressClick=(e:MouseEvent)=>{if(host.codec?.geometry&&(e.target as Element)?.closest('.stage-comment-pin')&&e.isTrusted&&e.detail>0&&suppressPinClick){suppressPinClick=false;e.preventDefault();e.stopImmediatePropagation();}};
293
+ const suppressClick=(e:MouseEvent)=>{if((e.target as Element)?.closest('.stage-comment-pin')&&e.isTrusted&&e.detail>0&&(suppressPinClick||spaceHeld())){suppressPinClick=false;e.preventDefault();e.stopImmediatePropagation();}};
292
294
  pane!.addEventListener('click',suppressClick,true);disposers.push(()=>pane!.removeEventListener('click',suppressClick,true));
293
295
  pane!.addEventListener('pointerdown',down,true);pane!.addEventListener('pointermove',move,true);pane!.addEventListener('pointerup',up,true);pane!.addEventListener('pointercancel',abort,true);pane!.addEventListener('lostpointercapture',abort,true);
294
296
  disposers.push(()=>{pane!.removeEventListener('pointerdown',down,true);pane!.removeEventListener('pointermove',move,true);pane!.removeEventListener('pointerup',up,true);pane!.removeEventListener('pointercancel',abort,true);pane!.removeEventListener('lostpointercapture',abort,true);});
295
297
  }
296
- const key=(e:KeyboardEvent)=>{if(host.shortcutActive&&!host.shortcutActive())return;if(e.key==='Escape'&&(pending||composer||(enabled||!inline&&!list.hidden)&&!host.shortcutBlocked?.()&&!textEntryFocused(e.target))){e.preventDefault();setOpen(false);return;}if(e.defaultPrevented||e.repeat||e.ctrlKey||e.metaKey||e.altKey||textEntryFocused(e.target)||host.shortcutBlocked?.())return;if(e.key.toLowerCase()==='c'){e.preventDefault();setOpen(inline?true:list.hidden);}};
297
- window.addEventListener('blur',cancel);window.addEventListener('resize',placeList);document.addEventListener('keydown',key);toggle.onclick=()=>setOpen(inline?true:list.hidden);
298
+ const key=(e:KeyboardEvent)=>{if(host.shortcutActive&&!host.shortcutActive())return;if(e.key==='Escape'&&(pending||composer||pinPress)){e.preventDefault();cancel();renderPins();return;}if(e.defaultPrevented||e.repeat||e.ctrlKey||e.metaKey||e.altKey||textEntryFocused(e.target)||host.shortcutBlocked?.())return;if(e.key.toLowerCase()==='c'){e.preventDefault();setOpen(inline?!enabled:list.hidden);}};
299
+ window.addEventListener('blur',cancel);window.addEventListener('resize',placeList);document.addEventListener('keydown',key);toggle.onclick=(e?:MouseEvent)=>{if(e?.detail)toggle.blur?.();setOpen(inline?!enabled:list.hidden);};
298
300
  const ro=typeof ResizeObserver==='function'?new ResizeObserver(()=>{if(!disposed&&!list.hidden)placeList();}):null;if(ro){try{ro.observe(host.toolbar);if(workspace)ro.observe(workspace);}catch{}}
299
301
  const renderPins=()=>{if(disposed)return;if(enabled&&host.hasPicture?.()===false){cancel();setCapture(false);}if(!list.hidden)placeList();const refusal=updateRefusal();if(refusal&&(enabled||pending||composer&&!composerReadOnly&&!composerGeneral)){cancel();setCapture(false);host.error(refusal);}const all=host.feedback().map(f=>({f,mark:readMark(f)})).filter(x=>x.mark);
300
302
  // #356: a pose reads the pane's size (a forced layout after the played frame's writes); with no mark, draft or pending
@@ -58,7 +58,8 @@ export function bindAppearance(control:HTMLSelectElement,initial:ThemePreference
58
58
  export function syncStageLayout(area:Pick<HTMLElement,'clientWidth'|'clientHeight'|'dataset'>):boolean {const next=stageOrientation(area.clientWidth,area.clientHeight);if(area.dataset.orientation===next)return false;area.dataset.orientation=next;return true;}
59
59
  export function bindStageLayout(area:HTMLElement,changed:()=>void):()=>void {
60
60
  const render=()=>{if(syncStageLayout(area))changed();};
61
- const observer=new ResizeObserver(render);observer.observe(area);render();return ()=>observer.disconnect();
61
+ const contextMenu=(event:Event)=>{if(!(event.target instanceof Element&&event.target.closest('.stage-comment-composer,input,textarea,select,[contenteditable]:not([contenteditable="false"])')))event.preventDefault();};
62
+ const observer=new ResizeObserver(render);observer.observe(area);area.addEventListener?.('contextmenu',contextMenu);render();return ()=>{observer.disconnect();area.removeEventListener?.('contextmenu',contextMenu);};
62
63
  }
63
64
  /** Single-key layer toggles. Free of Space (pan), Enter (frame entry), arrows/Home/End (tabs, separators, part list). */
64
65
  export const layerShortcuts=Object.freeze([
@@ -204,8 +205,11 @@ export function createViewControls(options:ViewControlsOptions) {
204
205
  return {zoomButtons,zoomGroup,syncLabel,value,nativeOne,viewSwitch,get viewModeIds(){return [...modes.keys()];},setMode,setDisabled,replaceViewSwitch};
205
206
  }
206
207
 
208
+ export function panSpaceHeld():boolean {return panSpace;}
207
209
  // Nested or separately disposed pan binders must not restore another binder's override.
208
210
  const panVideoOverrides=new WeakMap<HTMLVideoElement,{owners:number;value:string;priority:string}>();
211
+ let panSpace=false;
212
+ const panSpaceOwners=new Set<object>();
209
213
  /**
210
214
  * A drag that also carries the rig (#331): once the press has travelled more than `threshold` px from where it went down
211
215
  * (the click/drag line, the same one a stage click reads), each move is handed to `move` as well as panned. The first
@@ -213,8 +217,9 @@ const panVideoOverrides=new WeakMap<HTMLVideoElement,{owners:number;value:string
213
217
  * with Space held is a pan only, and a press that never passes the threshold is a click and carries nothing.
214
218
  */
215
219
  export interface PanCarry {threshold:number;move:(dx:number,dy:number)=>void}
216
- export function bindPan(viewport:HTMLElement,move:(dx:number,dy:number)=>void,enabled:()=>boolean=()=>true,carry?:PanCarry,pinch?:(factor:number,at:ViewPoint,delta:ViewPoint)=>void):()=>void {
220
+ export function bindPan(viewport:HTMLElement,move:(dx:number,dy:number)=>void,enabled:(panOnly?:boolean)=>boolean=()=>true,carry?:PanCarry,pinch?:(factor:number,at:ViewPoint,delta:ViewPoint)=>void):()=>void {
217
221
  let pointer:number|null=null,x=0,y=0,space=false,press:{x:number;y:number;far:boolean}|null=null;
222
+ const owner={};
218
223
  const touches=new Map<number,ViewPoint>();let pinching=false;const pair=()=>{const [a,b]=[...touches.values()];return a&&b?{distance:Math.hypot(a.x-b.x,a.y-b.y),center:{x:(a.x+b.x)/2,y:(a.y+b.y)/2}}:null;};
219
224
  const videos=new Set<HTMLVideoElement>();
220
225
  const releaseVideo=(video:HTMLVideoElement)=>{
@@ -231,15 +236,15 @@ export function bindPan(viewport:HTMLElement,move:(dx:number,dy:number)=>void,en
231
236
  }
232
237
  };
233
238
  const observer=new MutationObserver(()=>{if(space)syncVideos();});
234
- const releaseSpace=()=>{space=false;observer.disconnect();for(const video of videos)releaseVideo(video);videos.clear();};
239
+ const releaseSpace=()=>{space=false;panSpaceOwners.delete(owner);panSpace=panSpaceOwners.size>0;observer.disconnect();for(const video of videos)releaseVideo(video);videos.clear();};
235
240
  const releasePointer=()=>{const id=pointer;pointer=null;press=null;delete viewport.dataset.panning;if(id!==null&&viewport.hasPointerCapture(id))viewport.releasePointerCapture(id);};
236
- const keyDown=(event:KeyboardEvent)=>{if(event.code==='Space'&&enabled()&&!(event.target instanceof Element&&event.target.closest('input,textarea,select,button'))){
237
- if(!space){space=true;syncVideos();observer.observe(viewport,{childList:true,subtree:true,attributes:true,attributeFilter:['controls']});}event.preventDefault();
241
+ const keyDown=(event:KeyboardEvent)=>{if(event.code==='Space'&&enabled(true)&&!(event.target instanceof Element&&event.target.closest('input,textarea,select,button'))){
242
+ if(!space){space=true;panSpaceOwners.add(owner);panSpace=true;syncVideos();observer.observe(viewport,{childList:true,subtree:true,attributes:true,attributeFilter:['controls']});}event.preventDefault();
238
243
  }};
239
244
  const keyUp=(event:KeyboardEvent)=>{if(event.code==='Space')releaseSpace();};const blur=()=>{for(const id of touches.keys())if(viewport.hasPointerCapture(id))viewport.releasePointerCapture(id);touches.clear();pinching=false;releaseSpace();releasePointer();};
240
- const start=(event:PointerEvent)=>{if(enabled()&&pinch&&event.pointerType==='touch'&&!(event.target as Element)?.closest?.('button,input,select,textarea,a,[data-viewport-action]')){touches.set(event.pointerId,{x:event.clientX,y:event.clientY});if(touches.size===2){pointer=null;press=null;delete viewport.dataset.panning;pinching=true;viewport.setPointerCapture(event.pointerId);event.preventDefault();return;}}if(!enabled()||!event.isPrimary||event.button!==0)return;const target=event.target;if(target instanceof Element&&(target.closest('button,input,select,textarea,a,[data-viewport-action]')||target.closest('video[controls]')&&!space))return;pointer=event.pointerId;x=event.clientX;y=event.clientY;press=carry&&!space?{x,y,far:false}:null;viewport.setPointerCapture(pointer);viewport.dataset.panning='true';event.preventDefault();};
245
+ const start=(event:PointerEvent)=>{if(enabled(false)&&pinch&&event.pointerType==='touch'&&!(event.target as Element)?.closest?.('button,input,select,textarea,a,[data-viewport-action]')){touches.set(event.pointerId,{x:event.clientX,y:event.clientY});if(touches.size===2){pointer=null;press=null;delete viewport.dataset.panning;pinching=true;viewport.setPointerCapture(event.pointerId);event.preventDefault();return;}}const right=event.button===2,panOnly=space||panSpace||right;if(!enabled(panOnly)||!event.isPrimary||event.button!==0&&!right)return;const target=event.target,onPin=panOnly&&target instanceof Element&&!!target.closest('.stage-comment-pin,[data-comment-handle]');if(target instanceof Element&&(!onPin&&target.closest('button,input,select,textarea,a,[data-viewport-action],.stage-comment-composer')||target.closest('video[controls]')&&!panOnly))return;pointer=event.pointerId;x=event.clientX;y=event.clientY;press=carry&&!panOnly?{x,y,far:false}:null;viewport.setPointerCapture(pointer);viewport.dataset.panning='true';event.preventDefault();};
241
246
  const drag=(event:PointerEvent)=>{
242
- if(touches.has(event.pointerId)){const before=pair();touches.set(event.pointerId,{x:event.clientX,y:event.clientY});const after=pair();if(pinching){if(enabled()&&before&&after&&before.distance>0&&after.distance>0){const r=viewport.getBoundingClientRect();pinch?.(after.distance/before.distance,{x:before.center.x-r.left,y:before.center.y-r.top},{x:after.center.x-before.center.x,y:after.center.y-before.center.y});}event.preventDefault();return;}}
247
+ if(touches.has(event.pointerId)){const before=pair();touches.set(event.pointerId,{x:event.clientX,y:event.clientY});const after=pair();if(pinching){if(enabled(false)&&before&&after&&before.distance>0&&after.distance>0){const r=viewport.getBoundingClientRect();pinch?.(after.distance/before.distance,{x:before.center.x-r.left,y:before.center.y-r.top},{x:after.center.x-before.center.x,y:after.center.y-before.center.y});}event.preventDefault();return;}}
243
248
  if(event.pointerId!==pointer)return;const dx=event.clientX-x,dy=event.clientY-y;x=event.clientX;y=event.clientY;move(dx,dy);event.preventDefault();
244
249
  if(!press||!carry)return;
245
250
  if(press.far)carry.move(dx,dy);
@@ -247,8 +252,9 @@ export function bindPan(viewport:HTMLElement,move:(dx:number,dy:number)=>void,en
247
252
  };
248
253
  const end=(event:PointerEvent)=>{touches.delete(event.pointerId);if(event.pointerType==='touch'&&viewport.hasPointerCapture(event.pointerId))viewport.releasePointerCapture(event.pointerId);if(touches.size===0)pinching=false;if(event.pointerId===pointer)releasePointer();};
249
254
  const native=(event:DragEvent)=>event.preventDefault();
250
- window.addEventListener('blur',blur);document.addEventListener('keydown',keyDown,true);window.addEventListener('keyup',keyUp,true);viewport.addEventListener('pointerdown',start);viewport.addEventListener('pointermove',drag);viewport.addEventListener('pointerup',end);viewport.addEventListener('pointercancel',end);viewport.addEventListener('lostpointercapture',end);viewport.addEventListener('dragstart',native);
251
- return ()=>{blur();window.removeEventListener('blur',blur);document.removeEventListener('keydown',keyDown,true);window.removeEventListener('keyup',keyUp,true);viewport.removeEventListener('pointerdown',start);viewport.removeEventListener('pointermove',drag);viewport.removeEventListener('pointerup',end);viewport.removeEventListener('pointercancel',end);viewport.removeEventListener('lostpointercapture',end);viewport.removeEventListener('dragstart',native);};
255
+ const contextMenu=(event:Event)=>{if(!(event.target instanceof Element&&event.target.closest('.stage-comment-composer,input,textarea,select,[contenteditable]:not([contenteditable="false"])')))event.preventDefault();};
256
+ window.addEventListener('blur',blur);document.addEventListener('keydown',keyDown,true);window.addEventListener('keyup',keyUp,true);viewport.addEventListener('pointerdown',start);viewport.addEventListener('pointermove',drag);viewport.addEventListener('pointerup',end);viewport.addEventListener('pointercancel',end);viewport.addEventListener('lostpointercapture',end);viewport.addEventListener('dragstart',native);viewport.addEventListener('contextmenu',contextMenu);
257
+ return ()=>{blur();window.removeEventListener('blur',blur);document.removeEventListener('keydown',keyDown,true);window.removeEventListener('keyup',keyUp,true);viewport.removeEventListener('pointerdown',start);viewport.removeEventListener('pointermove',drag);viewport.removeEventListener('pointerup',end);viewport.removeEventListener('pointercancel',end);viewport.removeEventListener('lostpointercapture',end);viewport.removeEventListener('dragstart',native);viewport.removeEventListener('contextmenu',contextMenu);};
252
258
  }
253
259
 
254
260
  /** A discovered row; the block adapter supplies nodes, never another activation implementation. */
@@ -43,7 +43,7 @@ export interface ViewportController {
43
43
  requestFit:()=>void;
44
44
  /** Drop an owed or held Fit, for a caller that sets the camera itself (a restored bookmark). */
45
45
  cancelFit:()=>void;
46
- state:ViewportState;paneFrame:(target:CameraTarget,hidden?:boolean)=>CameraFrame|null;paneCamera:(target:CameraTarget)=>PaneCamera;writeCamera:(target:CameraTarget,value:PaneCamera)=>void;activateCamera:(target:CameraTarget)=>void;availableCamera:()=>CameraTarget|null;alignCameras:()=>void;renderCameraControls:()=>void;setCameraSync:(value:boolean)=>void;cameraAction:(action:()=>void)=>void;updateCamera:(target:CameraTarget,value:CameraSignature,group?:readonly CameraTarget[])=>void;zoomCamera:(factor:number,target?:CameraTarget|null,point?:CameraPoint|null)=>void;panCamera:(target:CameraTarget,dx:number,dy:number)=>void;fitActiveCamera:(target?:CameraTarget|null)=>void;fitSelection:(target?:CameraTarget|null)=>void;zoomViewport:(target:CameraTarget,deltaY:number,point?:CameraPoint|null)=>void;fitCamera:()=>void;numericView:()=>ControlView;renderNumericView:()=>void;bindControls:(onUnitScale?:(target:CameraTarget)=>void)=>()=>void;bindNavigation:(carryRig?:PanCarry|((target:CameraTarget)=>PanCarry|undefined),enabled?:()=>boolean)=>()=>void;observeResize:()=>ResizeObserver;
46
+ state:ViewportState;paneFrame:(target:CameraTarget,hidden?:boolean)=>CameraFrame|null;paneCamera:(target:CameraTarget)=>PaneCamera;writeCamera:(target:CameraTarget,value:PaneCamera)=>void;activateCamera:(target:CameraTarget)=>void;availableCamera:()=>CameraTarget|null;alignCameras:()=>void;renderCameraControls:()=>void;setCameraSync:(value:boolean)=>void;cameraAction:(action:()=>void)=>void;updateCamera:(target:CameraTarget,value:CameraSignature,group?:readonly CameraTarget[])=>void;zoomCamera:(factor:number,target?:CameraTarget|null,point?:CameraPoint|null)=>void;panCamera:(target:CameraTarget,dx:number,dy:number)=>void;fitActiveCamera:(target?:CameraTarget|null)=>void;fitSelection:(target?:CameraTarget|null)=>void;zoomViewport:(target:CameraTarget,deltaY:number,point?:CameraPoint|null)=>void;fitCamera:()=>void;numericView:()=>ControlView;renderNumericView:()=>void;bindControls:(onUnitScale?:(target:CameraTarget)=>void)=>()=>void;bindNavigation:(carryRig?:PanCarry|((target:CameraTarget)=>PanCarry|undefined),enabled?:(panOnly?:boolean)=>boolean)=>()=>void;observeResize:()=>ResizeObserver;
47
47
  }
48
48
 
49
49
  export function createViewportController(provider:ViewportProvider,state=createViewportState()):ViewportController {
@@ -163,7 +163,7 @@ function renderNumericView():void {const node=document.getElementById('view-coor
163
163
  }
164
164
  return ()=>{for(const dispose of disposers)dispose();if(nativeOne)nativeOne.onclick=null;for(const id of ['zoom-in','zoom-out','fit'])button(id).onclick=null;input('camera-sync').onchange=null;};
165
165
  }
166
- function bindNavigation(carryRig?:PanCarry|((target:CameraTarget)=>PanCarry|undefined),enabled:()=>boolean=()=>true):()=>void {
166
+ function bindNavigation(carryRig?:PanCarry|((target:CameraTarget)=>PanCarry|undefined),enabled:(panOnly?:boolean)=>boolean=()=>true):()=>void {
167
167
  const disposers:(()=>void)[]=[];disposers.push(bindStageLayout(el('stage-layout'),fitCamera));
168
168
  for(const {target,viewport}of panes())disposers.push(bindPan(viewport,(dx,dy)=>cameraAction(()=>panCamera(target,dx,dy)),enabled,typeof carryRig==='function'?carryRig(target):target==='rig'?carryRig:undefined,provider.pinch===false?undefined:(factor,at,delta)=>cameraAction(()=>{zoomCamera(factor,target,at);panCamera(target,delta.x,delta.y);})));
169
169
  return ()=>disposers.forEach(dispose=>dispose());