rig-review 2.9.0 → 2.10.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/docs/REVIEW_PACKAGE.md +138 -3
- package/package.json +1 -1
- package/src/job-api.ts +23 -9
- package/src/job-checkpoint-evidence.ts +113 -0
- package/src/job-contract.ts +24 -1
- package/src/job-front.ts +20 -3
- package/src/job-host.ts +2 -0
- package/src/job-session.ts +37 -5
- package/src/job-source.ts +52 -7
- package/web/catalog-en.ts +9 -0
- package/web/catalog-ko.ts +9 -0
- package/web/job-session.ts +331 -53
- package/web/parts.ts +6 -1
- package/web/stage-comments.ts +3 -3
- package/web/styles.css +17 -3
package/web/job-session.ts
CHANGED
|
@@ -5,6 +5,8 @@ import type {
|
|
|
5
5
|
DisplayPublicationV3,
|
|
6
6
|
EventV3,
|
|
7
7
|
JobDisplayReceipt,
|
|
8
|
+
JobCheckpointEvidence,
|
|
9
|
+
JobCheckpointTable,
|
|
8
10
|
JobInterviewDiagnostics,
|
|
9
11
|
JobResult,
|
|
10
12
|
JobUISubmission,
|
|
@@ -26,6 +28,7 @@ import {recordJobRigDraw, freezeJobRigCapture, copyJobRigViewport, createJobRigS
|
|
|
26
28
|
type JobRigDraw, type JobRigDrawState} from './job-rig-capture.ts';
|
|
27
29
|
import {advancePlayback} from './playback-clock.ts';
|
|
28
30
|
import {presentJobRigViewport, type JobRigPresentation} from './viewport-capture.ts';
|
|
31
|
+
import {SENTINELS} from './parts-render.ts';
|
|
29
32
|
import {CanvasRenderer} from '@rig-c/play';
|
|
30
33
|
import {JOB_PANEL_COMPOSITION_SCHEMA, JOB_PARTS_VERDICT_ACT_SCHEMA, parsePanelComposition} from '../src/job-contract.ts';
|
|
31
34
|
import type {PartsSource, PartsHost} from './parts.ts';
|
|
@@ -610,7 +613,12 @@ import type { Checkpoint, ReviewManifest, ReviewedSource } from '../src/manifest
|
|
|
610
613
|
import type { DirectionInspection } from '../src/direction-inspection.ts';
|
|
611
614
|
import type { FeedbackCatalog } from '../src/feedback-validation.ts';
|
|
612
615
|
import type { InterviewQuestion } from '../src/interview-project.ts';
|
|
616
|
+
type JobCheckpointEvidenceMetadata = Omit<JobCheckpointEvidence, 'tiles' | 'table'> & {
|
|
617
|
+
tiles: readonly (JobCheckpointEvidence['tiles'][number] & {url: string})[];
|
|
618
|
+
table: JobCheckpointEvidence['table'] & JobCheckpointTable & {url: string};
|
|
619
|
+
};
|
|
613
620
|
export interface JobInspectionMetadata {
|
|
621
|
+
checkpointEvidence?: readonly JobCheckpointEvidenceMetadata[];
|
|
614
622
|
manifest: ReviewManifest;
|
|
615
623
|
recordSource?: undefined;
|
|
616
624
|
sourceHash: string;
|
|
@@ -630,9 +638,10 @@ export interface JobInspectionMetadata {
|
|
|
630
638
|
preRig?: boolean;
|
|
631
639
|
playback: boolean;
|
|
632
640
|
};
|
|
633
|
-
feedbackCatalog: Pick<FeedbackCatalog, 'slots'
|
|
641
|
+
feedbackCatalog: Pick<FeedbackCatalog, 'slots'> & Partial<Pick<FeedbackCatalog, 'bones'>>;
|
|
634
642
|
}
|
|
635
643
|
export interface JobRecordInspectionMetadata {
|
|
644
|
+
checkpointEvidence?: readonly JobCheckpointEvidenceMetadata[];
|
|
636
645
|
manifest?: undefined;
|
|
637
646
|
recordSource: RecordSource;
|
|
638
647
|
sourceHash: string;
|
|
@@ -647,7 +656,7 @@ export interface JobRecordInspectionMetadata {
|
|
|
647
656
|
preRig?: boolean;
|
|
648
657
|
playback: boolean;
|
|
649
658
|
};
|
|
650
|
-
feedbackCatalog: Pick<FeedbackCatalog, 'slots'
|
|
659
|
+
feedbackCatalog: Pick<FeedbackCatalog, 'slots'> & Partial<Pick<FeedbackCatalog, 'bones'>>;
|
|
651
660
|
}
|
|
652
661
|
export type JobInspectionMetadataV3 = JobInspectionMetadata | JobRecordInspectionMetadata;
|
|
653
662
|
type JobInterview = {
|
|
@@ -756,6 +765,11 @@ export interface JobPreparedInspection {
|
|
|
756
765
|
partPages?: Map<number, HTMLImageElement>;
|
|
757
766
|
interviewImages: Map<string, HTMLImageElement>;
|
|
758
767
|
imageSetImages?: readonly HTMLImageElement[];
|
|
768
|
+
checkpointEvidence?: readonly {
|
|
769
|
+
packet: JobCheckpointEvidence;
|
|
770
|
+
table: JobCheckpointTable;
|
|
771
|
+
images: readonly HTMLImageElement[];
|
|
772
|
+
}[];
|
|
759
773
|
references: JobReferenceView[];
|
|
760
774
|
assets: ModelAssets | null;
|
|
761
775
|
player: RigPlayer | null;
|
|
@@ -873,22 +887,40 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
873
887
|
for (const url of objectUrls)
|
|
874
888
|
URL.revokeObjectURL(url);
|
|
875
889
|
};
|
|
876
|
-
async function visualBytes(url: string, hash?: string
|
|
877
|
-
|
|
890
|
+
async function visualBytes(url: string, hash?: string, maximum = 128 * 1024 * 1024,
|
|
891
|
+
hashRefusal = 'JOB_SOURCE_MISMATCH') {
|
|
892
|
+
const bytes = await jobBytes(url, signal, maximum);
|
|
878
893
|
if (hash && await jobDigest(bytes) !== hash)
|
|
879
|
-
throw new Error(
|
|
894
|
+
throw new Error(hashRefusal);
|
|
895
|
+
if (disposed || signal.aborted) throw new Error('JOB_PRELOAD_CANCELLED');
|
|
880
896
|
return bytes;
|
|
881
897
|
}
|
|
882
|
-
async function image(url: string, hash?: string): Promise<HTMLImageElement> {
|
|
883
|
-
const bytes = await visualBytes(url, hash
|
|
898
|
+
async function image(url: string, hash?: string, evidence = false): Promise<HTMLImageElement> {
|
|
899
|
+
const bytes = await visualBytes(url, hash, evidence ? 8 * 1024 * 1024 : undefined,
|
|
900
|
+
evidence ? 'CHECKPOINT_EVIDENCE_HASH_MISMATCH' : undefined);
|
|
901
|
+
if (disposed || signal.aborted) throw new Error('JOB_PRELOAD_CANCELLED');
|
|
884
902
|
const blob = URL.createObjectURL(new Blob([bytes.slice().buffer]));
|
|
885
903
|
objectUrls.push(blob);
|
|
886
904
|
const image = new Image();
|
|
887
905
|
image.src = blob;
|
|
888
|
-
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
|
|
906
|
+
let cancel: () => void = () => {};
|
|
907
|
+
const cancelled = new Promise<never>((_resolve, reject) => {
|
|
908
|
+
cancel = () => reject(new Error('JOB_PRELOAD_CANCELLED'));
|
|
909
|
+
signal.addEventListener('abort', cancel, {once: true});
|
|
910
|
+
if (signal.aborted) cancel();
|
|
911
|
+
});
|
|
912
|
+
try {
|
|
913
|
+
await Promise.race([image.decode().catch(error => {
|
|
914
|
+
if (evidence) throw new Error('CHECKPOINT_EVIDENCE_PNG_INVALID');
|
|
915
|
+
throw error;
|
|
916
|
+
}), cancelled]);
|
|
917
|
+
if (disposed || signal.aborted) throw new Error('JOB_PRELOAD_CANCELLED');
|
|
918
|
+
if (!image.naturalWidth || !image.naturalHeight)
|
|
919
|
+
throw new Error(evidence ? 'CHECKPOINT_EVIDENCE_PNG_INVALID' : 'JOB_VISUAL_UNAVAILABLE');
|
|
920
|
+
return image;
|
|
921
|
+
} finally {
|
|
922
|
+
signal.removeEventListener('abort', cancel);
|
|
923
|
+
}
|
|
892
924
|
}
|
|
893
925
|
try {
|
|
894
926
|
const interview = metadata.capabilities.interview ? await jobJson<JobInterview>(routes.api('interview'), signal) : null;
|
|
@@ -906,6 +938,48 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
906
938
|
const preload: Promise<void>[] = [];
|
|
907
939
|
const imageSetImages: HTMLImageElement[] = [];
|
|
908
940
|
const source = display.publication.source;
|
|
941
|
+
const checkpointEvidence: NonNullable<JobPreparedInspection['checkpointEvidence']>[number][] = [];
|
|
942
|
+
if (Object.hasOwn(metadata, 'checkpointEvidence') !== Object.hasOwn(source, 'checkpointEvidence') ||
|
|
943
|
+
source.checkpointEvidence !== undefined && (!Array.isArray(metadata.checkpointEvidence) ||
|
|
944
|
+
metadata.checkpointEvidence.length !== source.checkpointEvidence.length)) {
|
|
945
|
+
throw new Error('CHECKPOINT_EVIDENCE_INVALID');
|
|
946
|
+
}
|
|
947
|
+
for (const [index, packet] of (source.checkpointEvidence ?? []).entries()) {
|
|
948
|
+
const projection = metadata.checkpointEvidence?.[index];
|
|
949
|
+
const tableUrl = `/api/checkpoint-evidence/${packet.checkpointId}/table`;
|
|
950
|
+
if (!projection?.table || !source.plan?.steps.some(step => step.id === packet.planStepId) ||
|
|
951
|
+
source.subject === 'plan' && !source.subjects.some(subject => subject.kind === 'checkpoint' &&
|
|
952
|
+
subject.checkpointId === packet.checkpointId && packet.planStepId === packet.checkpointId) ||
|
|
953
|
+
sourceSnapshot(projection) !== sourceSnapshot({...packet,
|
|
954
|
+
tiles: packet.tiles.map((tile, tileIndex) => ({...tile,
|
|
955
|
+
url: `/api/checkpoint-evidence/${packet.checkpointId}/tiles/${tileIndex}`})),
|
|
956
|
+
table: {...packet.table, url: tableUrl, schema: projection.table.schema,
|
|
957
|
+
columns: projection.table.columns, rows: projection.table.rows}})) {
|
|
958
|
+
throw new Error('CHECKPOINT_EVIDENCE_INVALID');
|
|
959
|
+
}
|
|
960
|
+
}
|
|
961
|
+
for (const [index, packet] of (source.checkpointEvidence ?? []).entries()) {
|
|
962
|
+
preload.push((async () => {
|
|
963
|
+
const bytes = await visualBytes(routes.api(`checkpoint-evidence/${packet.checkpointId}/table`),
|
|
964
|
+
packet.table.sha256, 256 * 1024, 'CHECKPOINT_EVIDENCE_HASH_MISMATCH');
|
|
965
|
+
let table: JobCheckpointTable;
|
|
966
|
+
try {
|
|
967
|
+
table = JSON.parse(new TextDecoder('utf-8', {fatal: true}).decode(bytes));
|
|
968
|
+
const projection = metadata.checkpointEvidence![index]!.table;
|
|
969
|
+
if (sourceSnapshot(table) !== sourceSnapshot({schema: projection.schema,
|
|
970
|
+
columns: projection.columns, rows: projection.rows})) throw new Error();
|
|
971
|
+
} catch {
|
|
972
|
+
throw new Error('CHECKPOINT_EVIDENCE_TABLE_INVALID');
|
|
973
|
+
}
|
|
974
|
+
const images = await Promise.all(packet.tiles.map(async (tile, tileIndex) => {
|
|
975
|
+
const element = await image(routes.api(`checkpoint-evidence/${packet.checkpointId}/tiles/${tileIndex}`),
|
|
976
|
+
tile.sha256, true);
|
|
977
|
+
element.alt = tile.label;
|
|
978
|
+
return element;
|
|
979
|
+
}));
|
|
980
|
+
checkpointEvidence[index] = {packet, table, images};
|
|
981
|
+
})());
|
|
982
|
+
}
|
|
909
983
|
if (source.subject === 'image-set') {
|
|
910
984
|
if (metadata.sourceHash !== source.sourceHash || metadata.manifest?.model)
|
|
911
985
|
throw new Error('JOB_DISPLAY_MISMATCH');
|
|
@@ -1075,7 +1149,7 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
1075
1149
|
};
|
|
1076
1150
|
resetToSetup();
|
|
1077
1151
|
}
|
|
1078
|
-
if (!isRecordSource(source) && !player && !references.length && !partImages.size && !imageSetImages.length)
|
|
1152
|
+
if (!isRecordSource(source) && !player && !references.length && !partImages.size && !imageSetImages.length && !checkpointEvidence.length)
|
|
1079
1153
|
throw new Error('JOB_VISUAL_UNAVAILABLE');
|
|
1080
1154
|
if (signal.aborted)
|
|
1081
1155
|
throw new Error('JOB_PRELOAD_CANCELLED');
|
|
@@ -1083,7 +1157,7 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
1083
1157
|
const order = [metadata.sourcePainting?.id, ...(metadata.manifest?.references.map(reference => reference.id) ?? [])];
|
|
1084
1158
|
references.sort((a, b) => order.indexOf(a.id) - order.indexOf(b.id));
|
|
1085
1159
|
return {
|
|
1086
|
-
display, metadata, interview, parts, partImages, partPages, interviewImages, imageSetImages, references, assets, rigRoot,
|
|
1160
|
+
display, metadata, interview, parts, partImages, partPages, interviewImages, imageSetImages, checkpointEvidence, references, assets, rigRoot,
|
|
1087
1161
|
get rigPresentation() { return rigPresentation; },
|
|
1088
1162
|
set rigPresentation(value) {
|
|
1089
1163
|
clearRigPresentation();
|
|
@@ -1102,9 +1176,9 @@ export async function prepareJobInspection(display: DisplayPublicationV3, signal
|
|
|
1102
1176
|
}
|
|
1103
1177
|
/** Browser mount is explicit so importing transaction helpers never starts an app. */
|
|
1104
1178
|
export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
1105
|
-
const [{ createViewportController, createViewportState }, { createRigViewportProvider }, { mountViewportPair }, i18n] = await Promise.all([
|
|
1179
|
+
const [{ createViewportController, createViewportState }, { createRigViewportProvider }, { mountViewportPair }, { RigOverlays }, { bindLayerShortcuts, describeLayerToggles, layerShortcuts }, i18n] = await Promise.all([
|
|
1106
1180
|
import('./viewport-controller.ts'), import('./rig-viewport-provider.ts'),
|
|
1107
|
-
import('./viewport-pair.ts'), import('./i18n.ts'),
|
|
1181
|
+
import('./viewport-pair.ts'), import('./rig-overlays.ts'), import('./view-controls.ts'), import('./i18n.ts'),
|
|
1108
1182
|
]);
|
|
1109
1183
|
let storage: Storage | null = null;
|
|
1110
1184
|
try {
|
|
@@ -1304,6 +1378,9 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1304
1378
|
}>();
|
|
1305
1379
|
const forms = new Map<string, JobForm>();
|
|
1306
1380
|
const drawn = new WeakMap<JobPreparedInspection, JobRigDraw>();
|
|
1381
|
+
const overlays = new WeakMap<JobPreparedInspection, InstanceType<typeof RigOverlays>>();
|
|
1382
|
+
const layers = { images: true, mesh: false, bones: false, meshOpacity: 0.65 };
|
|
1383
|
+
let stageBackground = '';
|
|
1307
1384
|
let drawGeneration = 0;
|
|
1308
1385
|
const viewportState = createViewportState();
|
|
1309
1386
|
if (restoredCamera) {
|
|
@@ -1368,11 +1445,27 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1368
1445
|
const reference = () => current?.references.find(item => item.id === selectedReference) ?? null;
|
|
1369
1446
|
const setText = (id: string, value: string) => { const element = workspace.querySelector('#' + id); if (element)
|
|
1370
1447
|
element.textContent = i18n.tr(value); };
|
|
1448
|
+
function redrawOverlay(fresh: boolean): void {
|
|
1449
|
+
const owner = current, overlay = owner ? overlays.get(owner) : undefined;
|
|
1450
|
+
if (!owner || !overlay) return;
|
|
1451
|
+
const root = owner.rigRoot, scale = viewportState.rigScale;
|
|
1452
|
+
const left = parseFloat(root.style.left) || 0, top = parseFloat(root.style.top) || 0;
|
|
1453
|
+
const project = (x: number, y: number) => ({ x: left + x * scale, y: top - y * scale });
|
|
1454
|
+
const bones = (owner.metadata.feedbackCatalog.bones ?? []).map(name => ({ name }));
|
|
1455
|
+
const frame = owner.inspection?.frame('single');
|
|
1456
|
+
const selectedSlot = selectedPart || null;
|
|
1457
|
+
const snap = fresh
|
|
1458
|
+
? overlay.refresh({ player: owner.player, bones, frame, selectedSlot, project, settings: layers })
|
|
1459
|
+
: overlay.redraw({ project, settings: layers });
|
|
1460
|
+
if (!fresh && snap.needsCapture && owner.player) {
|
|
1461
|
+
overlay.refresh({ player: owner.player, bones, frame, selectedSlot, project, settings: layers });
|
|
1462
|
+
}
|
|
1463
|
+
}
|
|
1371
1464
|
const provider = createRigViewportProvider({
|
|
1372
1465
|
el, player: () => current?.player ?? null, assets: () => current?.assets ?? null,
|
|
1373
1466
|
referenceSize: () => reference(), view: () => 'compare', referenceGeneration: () => current?.display.publication.generation ?? 0,
|
|
1374
1467
|
parts: () => current?.inspection ?? null, text: setText,
|
|
1375
|
-
message: value => { notice.textContent = jobWindowRefusal(value); }, redrawOverlay:
|
|
1468
|
+
message: value => { notice.textContent = jobWindowRefusal(value); }, redrawOverlay: fresh => redrawOverlay(fresh),
|
|
1376
1469
|
}, viewportState);
|
|
1377
1470
|
const canonicalControls = provider.renderControls;
|
|
1378
1471
|
provider.renderControls = controller => {
|
|
@@ -1421,13 +1514,26 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1421
1514
|
pixels?.width, pixels?.height, canvas?.width, canvas?.height, canvas?.getAttribute('style'),
|
|
1422
1515
|
]),
|
|
1423
1516
|
defaultCamera: plain && camera.zoom === 1 && camera.center.x === frame.center.x && camera.center.y === frame.center.y,
|
|
1424
|
-
wholeRig: !selectedPart && !owner.inspection?.value() && player.slots === null
|
|
1517
|
+
wholeRig: !selectedPart && !owner.inspection?.value() && player.slots === null &&
|
|
1518
|
+
layers.images && !layers.mesh && !layers.bones && !stageBackground,
|
|
1425
1519
|
playing};
|
|
1426
1520
|
}
|
|
1427
1521
|
function rememberDraw(): void {
|
|
1428
1522
|
const owner = current;
|
|
1429
1523
|
if (!owner) return;
|
|
1430
1524
|
try {
|
|
1525
|
+
const pane = el('rig-viewport');
|
|
1526
|
+
const bg = SENTINELS[stageBackground] ?? '';
|
|
1527
|
+
pane.style.backgroundColor = bg;
|
|
1528
|
+
pane.style.backgroundImage = bg ? 'none' : '';
|
|
1529
|
+
if (!layers.images || layers.mesh || layers.bones || bg) {
|
|
1530
|
+
drawn.delete(owner);
|
|
1531
|
+
owner.rigPresentation = undefined;
|
|
1532
|
+
delete pane.dataset.jobRigCanonical;
|
|
1533
|
+
owner.rigRoot.style.visibility = layers.images ? 'visible' : 'hidden';
|
|
1534
|
+
return;
|
|
1535
|
+
}
|
|
1536
|
+
owner.rigRoot.style.visibility = '';
|
|
1431
1537
|
const player = owner.player;
|
|
1432
1538
|
const posed = owner.inspection?.frame('single');
|
|
1433
1539
|
const camera = viewport.numericView().cameras.rig;
|
|
@@ -1435,7 +1541,6 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1435
1541
|
throw new Error('JOB_STILL_CAPTURE_FAILED');
|
|
1436
1542
|
}
|
|
1437
1543
|
const renderer = player.renderer;
|
|
1438
|
-
const pane = el('rig-viewport');
|
|
1439
1544
|
const presentation = presentJobRigViewport({pane, root: owner.rigRoot, images: true,
|
|
1440
1545
|
canvas: renderer instanceof CanvasRenderer ? renderer.canvas : undefined,
|
|
1441
1546
|
backend: renderer instanceof CanvasRenderer ? renderer.backendActive : renderer.meshBackendActive},
|
|
@@ -1454,6 +1559,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1454
1559
|
owner.rigPresentation = undefined;
|
|
1455
1560
|
owner.player?.draw();
|
|
1456
1561
|
owner.inspection?.present('single');
|
|
1562
|
+
if (owner === current) redrawOverlay(true);
|
|
1457
1563
|
}
|
|
1458
1564
|
function syncTransportControls(): void {
|
|
1459
1565
|
const playBtn = workspace.querySelector<HTMLButtonElement>('#job-play');
|
|
@@ -1635,6 +1741,43 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1635
1741
|
parent.append(inputLabel(key, input));
|
|
1636
1742
|
return input;
|
|
1637
1743
|
}
|
|
1744
|
+
function imageGallery(images: readonly {name: string; sha256: string; element?: HTMLImageElement;
|
|
1745
|
+
role?: string; duplicate?: boolean}[]): HTMLElement {
|
|
1746
|
+
const gallery = node('section');
|
|
1747
|
+
gallery.style.display = 'grid';
|
|
1748
|
+
gallery.style.gridAutoFlow = 'column';
|
|
1749
|
+
gallery.style.gridAutoColumns = 'minmax(180px, 1fr)';
|
|
1750
|
+
gallery.style.gap = '16px';
|
|
1751
|
+
gallery.style.overflow = 'auto';
|
|
1752
|
+
gallery.style.minHeight = '0';
|
|
1753
|
+
gallery.style.flex = '1';
|
|
1754
|
+
for (const image of images) {
|
|
1755
|
+
const element = image.element;
|
|
1756
|
+
if (!element) throw new Error('JOB_VISUAL_UNAVAILABLE');
|
|
1757
|
+
const figure = node('figure');
|
|
1758
|
+
figure.style.margin = '0';
|
|
1759
|
+
figure.style.minWidth = '0';
|
|
1760
|
+
figure.dataset.imageName = image.name;
|
|
1761
|
+
const name = node('h3');
|
|
1762
|
+
name.textContent = image.name;
|
|
1763
|
+
name.style.overflowWrap = 'anywhere';
|
|
1764
|
+
const role = image.role ? node('p', 'job.imageRole.' + image.role) : node('p');
|
|
1765
|
+
const hash = node('code');
|
|
1766
|
+
hash.className = 'job-source';
|
|
1767
|
+
hash.style.display = 'block';
|
|
1768
|
+
hash.style.overflowWrap = 'anywhere';
|
|
1769
|
+
hash.textContent = image.sha256;
|
|
1770
|
+
element.style.width = '100%';
|
|
1771
|
+
element.style.height = 'auto';
|
|
1772
|
+
element.style.maxHeight = '70vh';
|
|
1773
|
+
element.style.objectFit = 'contain';
|
|
1774
|
+
figure.append(name, role, element, hash);
|
|
1775
|
+
if (image.duplicate)
|
|
1776
|
+
figure.append(node('p', 'job.identicalImages'));
|
|
1777
|
+
gallery.append(figure);
|
|
1778
|
+
}
|
|
1779
|
+
return gallery;
|
|
1780
|
+
}
|
|
1638
1781
|
function formFor(ask: PendingAskV3, prepared: JobPreparedInspection): JobForm {
|
|
1639
1782
|
if (ask.publicationId !== prepared.display.publication.publicationId)
|
|
1640
1783
|
throw new Error('JOB_DISPLAY_MISMATCH');
|
|
@@ -1733,6 +1876,57 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1733
1876
|
planStep.className = 'job-source';
|
|
1734
1877
|
planStep.textContent = checkpoint.step.id + ' · ' + checkpoint.step.hash;
|
|
1735
1878
|
fields.append(planStep, guidance);
|
|
1879
|
+
const evidence = prepared.checkpointEvidence?.find(item => item.packet.checkpointId === subject.checkpointId);
|
|
1880
|
+
const declared = ask.source.checkpointEvidence?.find(item => item.checkpointId === subject.checkpointId);
|
|
1881
|
+
if (Boolean(declared) !== Boolean(evidence) || evidence &&
|
|
1882
|
+
(JSON.stringify(evidence.packet) !== JSON.stringify(declared) || evidence.packet.planStepId !== checkpoint.step.id)) {
|
|
1883
|
+
throw new Error('CHECKPOINT_EVIDENCE_INVALID');
|
|
1884
|
+
}
|
|
1885
|
+
if (evidence) {
|
|
1886
|
+
const section = node('section');
|
|
1887
|
+
section.dataset.jobCheckpointEvidence = subject.checkpointId;
|
|
1888
|
+
section.append(node('h4', 'job.checkpointEvidence'));
|
|
1889
|
+
section.append(imageGallery(evidence.packet.tiles.map((tile, index) => ({name: tile.label,
|
|
1890
|
+
sha256: tile.sha256, element: evidence.images[index]?.cloneNode(true) as HTMLImageElement}))));
|
|
1891
|
+
const tableHost = node('div');
|
|
1892
|
+
tableHost.style.overflow = 'auto';
|
|
1893
|
+
tableHost.style.maxHeight = '50dvh';
|
|
1894
|
+
const table = node('table');
|
|
1895
|
+
table.dataset.jobCheckpointTable = '';
|
|
1896
|
+
const caption = node('caption', 'job.checkpointTable');
|
|
1897
|
+
if (evidence.packet.table.label !== undefined) {
|
|
1898
|
+
delete caption.dataset.jobText;
|
|
1899
|
+
caption.textContent = evidence.packet.table.label;
|
|
1900
|
+
}
|
|
1901
|
+
const head = node('thead');
|
|
1902
|
+
const columns = node('tr');
|
|
1903
|
+
for (const column of evidence.table.columns) {
|
|
1904
|
+
const cell = node('th');
|
|
1905
|
+
cell.scope = 'col';
|
|
1906
|
+
cell.textContent = column;
|
|
1907
|
+
columns.append(cell);
|
|
1908
|
+
}
|
|
1909
|
+
head.append(columns);
|
|
1910
|
+
const body = node('tbody');
|
|
1911
|
+
for (const row of evidence.table.rows) {
|
|
1912
|
+
const cells = node('tr');
|
|
1913
|
+
for (const value of row) {
|
|
1914
|
+
const cell = node('td');
|
|
1915
|
+
cell.textContent = String(value);
|
|
1916
|
+
cells.append(cell);
|
|
1917
|
+
}
|
|
1918
|
+
body.append(cells);
|
|
1919
|
+
}
|
|
1920
|
+
table.append(caption, head, body);
|
|
1921
|
+
tableHost.append(table);
|
|
1922
|
+
const routes = node('pre');
|
|
1923
|
+
routes.textContent = evidence.packet.routesText;
|
|
1924
|
+
const recommendation = node('pre');
|
|
1925
|
+
recommendation.textContent = evidence.packet.recommendationText;
|
|
1926
|
+
section.append(tableHost, node('h4', 'job.checkpointRoutes'), routes,
|
|
1927
|
+
node('h4', 'job.checkpointRecommendation'), recommendation);
|
|
1928
|
+
fields.append(section, node('p', 'job.checkpointRouteMapping'));
|
|
1929
|
+
}
|
|
1736
1930
|
const outcome = selectValues(['', 'pass', 'fail'], ['Pending', 'Pass', 'job.fail']);
|
|
1737
1931
|
outcome.required = true;
|
|
1738
1932
|
outcome.name = 'outcome';
|
|
@@ -1935,6 +2129,41 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
1935
2129
|
}
|
|
1936
2130
|
}
|
|
1937
2131
|
}
|
|
2132
|
+
const hasCheckpointAsk = Boolean(current.player) && state.pending.some(
|
|
2133
|
+
ask => ask.publicationId === current!.display.publication.publicationId &&
|
|
2134
|
+
ask.status === 'pending' && ask.subject.kind === 'checkpoint',
|
|
2135
|
+
);
|
|
2136
|
+
const layerSet = workspace.querySelector<HTMLElement>('#layer-controls');
|
|
2137
|
+
const bgField = workspace.querySelector<HTMLElement>('#job-background-field');
|
|
2138
|
+
const bgSelect = workspace.querySelector<HTMLSelectElement>('#job-background');
|
|
2139
|
+
const hadNonDefaultView = !layers.images || layers.mesh || layers.bones || Boolean(stageBackground);
|
|
2140
|
+
if (!hasCheckpointAsk && hadNonDefaultView) {
|
|
2141
|
+
layers.images = true;
|
|
2142
|
+
layers.mesh = false;
|
|
2143
|
+
layers.bones = false;
|
|
2144
|
+
stageBackground = '';
|
|
2145
|
+
}
|
|
2146
|
+
if (layerSet) {
|
|
2147
|
+
layerSet.hidden = !hasCheckpointAsk;
|
|
2148
|
+
for (const [id, key] of [['layer-images', 'images'], ['layer-mesh', 'mesh'], ['layer-bones', 'bones']] as const) {
|
|
2149
|
+
const box = layerSet.querySelector<HTMLInputElement>('#' + id);
|
|
2150
|
+
if (box) {
|
|
2151
|
+
box.disabled = !hasCheckpointAsk;
|
|
2152
|
+
box.checked = layers[key];
|
|
2153
|
+
}
|
|
2154
|
+
}
|
|
2155
|
+
describeLayerToggles({ getElementById: id => layerSet.querySelector('#' + id) }, t('No rig supplied'));
|
|
2156
|
+
for (const label of layerSet.querySelectorAll<HTMLElement>('.layer-toggle')) label.title = i18n.tr(label.title);
|
|
2157
|
+
}
|
|
2158
|
+
if (bgField && bgSelect) {
|
|
2159
|
+
bgField.hidden = !hasCheckpointAsk;
|
|
2160
|
+
bgSelect.disabled = !hasCheckpointAsk;
|
|
2161
|
+
bgSelect.value = stageBackground;
|
|
2162
|
+
}
|
|
2163
|
+
if (!hasCheckpointAsk && hadNonDefaultView) {
|
|
2164
|
+
redrawOverlay(true);
|
|
2165
|
+
rememberDraw();
|
|
2166
|
+
}
|
|
1938
2167
|
}
|
|
1939
2168
|
async function mountJobParts(prepared: JobPreparedInspection, signal: AbortSignal): Promise<void> {
|
|
1940
2169
|
const panel = partsPanels.get(prepared)!;
|
|
@@ -2152,6 +2381,55 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2152
2381
|
stage.className = 'job-stage';
|
|
2153
2382
|
const controls = node('div');
|
|
2154
2383
|
controls.className = 'viewbar';
|
|
2384
|
+
const layerSet = node('fieldset');
|
|
2385
|
+
layerSet.id = 'layer-controls';
|
|
2386
|
+
layerSet.className = 'layer-toggles';
|
|
2387
|
+
layerSet.hidden = true;
|
|
2388
|
+
const legend = node('legend', 'Rig layers');
|
|
2389
|
+
legend.className = 'sr-only';
|
|
2390
|
+
layerSet.append(legend);
|
|
2391
|
+
for (const item of layerShortcuts) {
|
|
2392
|
+
const label = node('label');
|
|
2393
|
+
label.className = 'layer-toggle';
|
|
2394
|
+
const box = node('input');
|
|
2395
|
+
box.id = item.id;
|
|
2396
|
+
box.type = 'checkbox';
|
|
2397
|
+
box.setAttribute('aria-keyshortcuts', item.key.toUpperCase());
|
|
2398
|
+
const keyName = item.id === 'layer-images' ? 'images' : item.id === 'layer-mesh' ? 'mesh' : 'bones';
|
|
2399
|
+
box.checked = layers[keyName];
|
|
2400
|
+
box.disabled = true;
|
|
2401
|
+
box.onchange = () => {
|
|
2402
|
+
layers[keyName] = box.checked;
|
|
2403
|
+
if (current === prepared) {
|
|
2404
|
+
redrawOverlay(true);
|
|
2405
|
+
rememberDraw();
|
|
2406
|
+
}
|
|
2407
|
+
};
|
|
2408
|
+
const kbd = node('kbd');
|
|
2409
|
+
kbd.setAttribute('aria-hidden', 'true');
|
|
2410
|
+
kbd.textContent = item.key.toUpperCase();
|
|
2411
|
+
label.append(box, node('span', item.label), kbd);
|
|
2412
|
+
layerSet.append(label);
|
|
2413
|
+
}
|
|
2414
|
+
describeLayerToggles({ getElementById: id => layerSet.querySelector('#' + id) }, t('No rig supplied'));
|
|
2415
|
+
for (const label of layerSet.querySelectorAll<HTMLElement>('.layer-toggle')) label.title = i18n.tr(label.title);
|
|
2416
|
+
const sentinelKeys = Object.keys(SENTINELS);
|
|
2417
|
+
const bgSelect = selectValues(['', ...sentinelKeys], ['Rig', ...sentinelKeys.map(k => k[0]!.toUpperCase() + k.slice(1))]);
|
|
2418
|
+
bgSelect.id = 'job-background';
|
|
2419
|
+
bgSelect.value = stageBackground;
|
|
2420
|
+
bgSelect.disabled = true;
|
|
2421
|
+
bgSelect.onchange = () => {
|
|
2422
|
+
stageBackground = Object.hasOwn(SENTINELS, bgSelect.value) ? bgSelect.value : '';
|
|
2423
|
+
bgSelect.value = stageBackground;
|
|
2424
|
+
if (current === prepared) {
|
|
2425
|
+
redrawOverlay(false);
|
|
2426
|
+
rememberDraw();
|
|
2427
|
+
}
|
|
2428
|
+
};
|
|
2429
|
+
const bgField = inputLabel('Background', bgSelect);
|
|
2430
|
+
bgField.id = 'job-background-field';
|
|
2431
|
+
bgField.hidden = true;
|
|
2432
|
+
controls.append(layerSet, bgField);
|
|
2155
2433
|
for (const [id, key] of [['zoom-in', 'job.zoomIn'], ['zoom-out', 'job.zoomOut'], ['fit', 'Fit']]) {
|
|
2156
2434
|
const button = node('button', key);
|
|
2157
2435
|
button.id = id!;
|
|
@@ -2168,7 +2446,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2168
2446
|
const pair = node('div');
|
|
2169
2447
|
pair.id = 'stage-layout';
|
|
2170
2448
|
mountViewportPair(pair);
|
|
2171
|
-
for (const id of ['
|
|
2449
|
+
for (const id of ['idle-handles', 'rig-fields-stage'])
|
|
2172
2450
|
pair.querySelector('#' + id)?.remove();
|
|
2173
2451
|
for (const [id, key] of [['reference-label', 'Reference'], ['rig-label', 'Generated rig · read only'],
|
|
2174
2452
|
['reference-empty', 'No reference supplied.'], ['rig-empty', 'No compiled model supplied.']]) {
|
|
@@ -2180,7 +2458,20 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2180
2458
|
}
|
|
2181
2459
|
pair.querySelector('#reference-pane')?.setAttribute('aria-label', t('Reference'));
|
|
2182
2460
|
pair.querySelector('#rig-pane')?.setAttribute('aria-label', t('Rig'));
|
|
2461
|
+
const rigViewport = pair.querySelector<HTMLElement>('#rig-viewport');
|
|
2462
|
+
if (rigViewport) {
|
|
2463
|
+
rigViewport.setAttribute('tabindex', '-1');
|
|
2464
|
+
rigViewport.addEventListener('pointerdown', () => rigViewport.focus?.());
|
|
2465
|
+
}
|
|
2183
2466
|
pair.querySelector('#rig-root')!.replaceWith(prepared.rigRoot);
|
|
2467
|
+
const overlayCanvas = pair.querySelector<HTMLCanvasElement>('#rig-overlay');
|
|
2468
|
+
if (overlayCanvas) {
|
|
2469
|
+
overlayCanvas.setAttribute('aria-label', t('Actual rig mesh and bone overlay'));
|
|
2470
|
+
const instance = new RigOverlays({ canvas: overlayCanvas, rigRoot: prepared.rigRoot });
|
|
2471
|
+
overlays.set(prepared, instance);
|
|
2472
|
+
const prevDispose = prepared.dispose;
|
|
2473
|
+
prepared.dispose = () => { try { instance.dispose(); } finally { prevDispose(); } };
|
|
2474
|
+
}
|
|
2184
2475
|
const transport = node('div');
|
|
2185
2476
|
transport.className = 'job-transport';
|
|
2186
2477
|
const clips = node('select');
|
|
@@ -2304,40 +2595,10 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2304
2595
|
const digestValue = node('code');
|
|
2305
2596
|
digestValue.textContent = source.imageSetDigest;
|
|
2306
2597
|
digest.append(digestLabel, document.createTextNode(' '), digestValue);
|
|
2307
|
-
const gallery =
|
|
2598
|
+
const gallery = imageGallery(source.imageSet.images.map((image, index) => ({...image,
|
|
2599
|
+
element: prepared.imageSetImages?.[index],
|
|
2600
|
+
duplicate: source.duplicateHashes.some(group => group.names.includes(image.name))})));
|
|
2308
2601
|
gallery.dataset.jobImageSet = '';
|
|
2309
|
-
gallery.style.display = 'grid';
|
|
2310
|
-
gallery.style.gridAutoFlow = 'column';
|
|
2311
|
-
gallery.style.gridAutoColumns = 'minmax(180px, 1fr)';
|
|
2312
|
-
gallery.style.gap = '16px';
|
|
2313
|
-
gallery.style.overflow = 'auto';
|
|
2314
|
-
gallery.style.minHeight = '0';
|
|
2315
|
-
gallery.style.flex = '1';
|
|
2316
|
-
for (const [index, image] of source.imageSet.images.entries()) {
|
|
2317
|
-
const element = prepared.imageSetImages?.[index];
|
|
2318
|
-
if (!element) throw new Error('JOB_VISUAL_UNAVAILABLE');
|
|
2319
|
-
const figure = node('figure');
|
|
2320
|
-
figure.style.margin = '0';
|
|
2321
|
-
figure.style.minWidth = '0';
|
|
2322
|
-
figure.dataset.imageName = image.name;
|
|
2323
|
-
const name = node('h3');
|
|
2324
|
-
name.textContent = image.name;
|
|
2325
|
-
name.style.overflowWrap = 'anywhere';
|
|
2326
|
-
const role = node('p', 'job.imageRole.' + image.role);
|
|
2327
|
-
const hash = node('code');
|
|
2328
|
-
hash.className = 'job-source';
|
|
2329
|
-
hash.style.display = 'block';
|
|
2330
|
-
hash.style.overflowWrap = 'anywhere';
|
|
2331
|
-
hash.textContent = image.sha256;
|
|
2332
|
-
element.style.width = '100%';
|
|
2333
|
-
element.style.height = 'auto';
|
|
2334
|
-
element.style.maxHeight = '70vh';
|
|
2335
|
-
element.style.objectFit = 'contain';
|
|
2336
|
-
figure.append(name, role, element, hash);
|
|
2337
|
-
if (source.duplicateHashes.some(group => group.names.includes(image.name)))
|
|
2338
|
-
figure.append(node('p', 'job.identicalImages'));
|
|
2339
|
-
gallery.append(figure);
|
|
2340
|
-
}
|
|
2341
2602
|
stage.prepend(heading, digest, gallery);
|
|
2342
2603
|
controls.hidden = pair.hidden = transport.hidden = true;
|
|
2343
2604
|
controls.style.display = pair.style.display = transport.style.display = 'none';
|
|
@@ -2431,6 +2692,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2431
2692
|
drawn.delete(current);
|
|
2432
2693
|
current.rigPresentation = undefined;
|
|
2433
2694
|
current.inspection.select(selectedPart ? { side: 'single', slot: selectedPart, mode: partMode } : null);
|
|
2695
|
+
redrawOverlay(true);
|
|
2434
2696
|
rememberDraw();
|
|
2435
2697
|
setText('job-part-observation', selectedPart ? JSON.stringify(current.inspection.observation(), null, 2) : '');
|
|
2436
2698
|
viewport.renderCameraControls();
|
|
@@ -2542,6 +2804,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2542
2804
|
const previousForms = new Map(forms);
|
|
2543
2805
|
const restoringCamera = Boolean(previous || restoredCamera);
|
|
2544
2806
|
const navigation = { animation, time, loop, selectedPart, partMode, selectedReference, panel,
|
|
2807
|
+
layers: { images: layers.images, mesh: layers.mesh, bones: layers.bones }, stageBackground,
|
|
2545
2808
|
partIdentity: previous ? (previous.inspection?.value() ?? null) : restoredPartIdentity,
|
|
2546
2809
|
camera: structuredClone(viewportState) };
|
|
2547
2810
|
compatibilityNotice = Boolean(!previous &&
|
|
@@ -2573,6 +2836,8 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2573
2836
|
partMode = navigation.partMode;
|
|
2574
2837
|
selectedReference = navigation.selectedReference;
|
|
2575
2838
|
panel = navigation.panel;
|
|
2839
|
+
Object.assign(layers, navigation.layers);
|
|
2840
|
+
stageBackground = navigation.stageBackground;
|
|
2576
2841
|
forms.clear();
|
|
2577
2842
|
for (const [id, item] of previousForms)
|
|
2578
2843
|
forms.set(id, item);
|
|
@@ -2604,6 +2869,13 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2604
2869
|
el<HTMLSelectElement>('job-reference').value = selectedReference;
|
|
2605
2870
|
el<HTMLSelectElement>('job-animation').value = animation;
|
|
2606
2871
|
el<HTMLInputElement>('job-loop').checked = loop;
|
|
2872
|
+
layers.images = true;
|
|
2873
|
+
layers.mesh = false;
|
|
2874
|
+
layers.bones = false;
|
|
2875
|
+
stageBackground = '';
|
|
2876
|
+
for (const [id, key] of [['layer-images', 'images'], ['layer-mesh', 'mesh'], ['layer-bones', 'bones']] as const) {
|
|
2877
|
+
el<HTMLInputElement>(id).checked = layers[key];
|
|
2878
|
+
}
|
|
2607
2879
|
el('rig-empty').hidden = !!prepared.player;
|
|
2608
2880
|
Object.assign(viewportState, navigation.camera, { cameraRestoring: restoringCamera });
|
|
2609
2881
|
showReference();
|
|
@@ -2724,12 +2996,17 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2724
2996
|
if (state.receipt && !state.preparing) events?.displayed();
|
|
2725
2997
|
},
|
|
2726
2998
|
} });
|
|
2999
|
+
const unbindLayerShortcuts = bindLayerShortcuts(document);
|
|
2727
3000
|
const localize = i18n.onLanguageChange(() => {
|
|
2728
3001
|
for (const element of host.querySelectorAll<HTMLElement>('[data-job-text]'))
|
|
2729
3002
|
element.textContent = t(element.dataset.jobText!);
|
|
2730
3003
|
languages.setAttribute('aria-label', t('interview.language'));
|
|
2731
|
-
if (current && !partsPanels.has(current))
|
|
3004
|
+
if (current && !partsPanels.has(current)) {
|
|
3005
|
+
workspace.querySelector('#rig-overlay')?.setAttribute('aria-label', t('Actual rig mesh and bone overlay'));
|
|
3006
|
+
describeLayerToggles({ getElementById: id => workspace.querySelector('#' + id) }, t('No rig supplied'));
|
|
3007
|
+
for (const label of workspace.querySelectorAll<HTMLElement>('.layer-toggle')) label.title = i18n.tr(label.title);
|
|
2732
3008
|
viewport.renderCameraControls();
|
|
3009
|
+
}
|
|
2733
3010
|
window.refresh();
|
|
2734
3011
|
});
|
|
2735
3012
|
const hubVisibility = (event: MessageEvent) => {
|
|
@@ -2774,6 +3051,7 @@ export async function mountJobSession(host: HTMLElement): Promise<() => void> {
|
|
|
2774
3051
|
abort.abort();
|
|
2775
3052
|
window.stop();
|
|
2776
3053
|
localize();
|
|
3054
|
+
unbindLayerShortcuts();
|
|
2777
3055
|
unbindNavigation?.();
|
|
2778
3056
|
resize?.disconnect();
|
|
2779
3057
|
current?.dispose();
|
package/web/parts.ts
CHANGED
|
@@ -284,7 +284,12 @@ async function paint():Promise<void>{
|
|
|
284
284
|
try{
|
|
285
285
|
await paintRaster(token);if(disposed||token!==paintToken)return;
|
|
286
286
|
await paintReference(token);if(disposed||token!==paintToken)return;
|
|
287
|
-
if(paintFailure&&$('pv-save-status').textContent===t(paintFailure))$('pv-save-status').textContent='';paintFailure=null;
|
|
287
|
+
if(paintFailure&&$('pv-save-status').textContent===t(paintFailure))$('pv-save-status').textContent='';paintFailure=null;painting=false;
|
|
288
|
+
if(paintBusyStatus?.token===token){
|
|
289
|
+
if($('pv-save-status').textContent===paintBusyStatus.text)$('pv-save-status').textContent='';
|
|
290
|
+
paintBusyStatus=null;
|
|
291
|
+
}
|
|
292
|
+
syncPaintState();viewport?.fitCamera();commentUi?.refresh();settleReady();
|
|
288
293
|
}catch(error){
|
|
289
294
|
if(disposed||token!==paintToken)return;
|
|
290
295
|
settleReady(error instanceof Error?error:new Error('PARTS_PAINT_FAILED'));
|
package/web/stage-comments.ts
CHANGED
|
@@ -108,7 +108,7 @@ export function bindStageComments<Row extends CommentRow=Feedback,Pose extends C
|
|
|
108
108
|
if(!reason&&host.blocked()){host.error(t('COMMENT_BUSY: close the active editor or wait for the inspection to settle'));return;}
|
|
109
109
|
list.hidden=false;placeList();toggle.setAttribute('aria-expanded','true');renderList();
|
|
110
110
|
if(reason){setCapture(false);host.error(reason);return;}
|
|
111
|
-
setCapture(true);
|
|
111
|
+
setCapture(true);for(const view of layers.keys())host.pose(view);
|
|
112
112
|
};
|
|
113
113
|
const openComment=async(f:Row)=>{const mark=readMark(f);if(!mark)return;if(list.hidden)setOpen(true);if(list.hidden)return;if(await jump(f)){const reason=updateRefusal();setCapture(!reason&&!host.blocked());openComposer(mark.viewport,mark.screen,f,host.pose(mark.viewport)?.mode??mark.mode);}};
|
|
114
114
|
const renderList=()=>{placeList();list.setAttribute('aria-label',t(inline?'Issues':'Stage comments'));list.replaceChildren();const title=document.createElement('strong');title.textContent=t(inline?'Issues':'Comments');list.append(title);const rawReason=host.refusal?.()??null,reason=rawReason?t(rawReason):null;if(reason){const note=document.createElement('small');note.className='stage-comment-refusal-note';note.title=reason;note.textContent=reason;Object.assign(note.style,{display:'block',marginTop:'4px',maxWidth:'100%',whiteSpace:inline?'normal':'nowrap',overflow:'hidden',textOverflow:'ellipsis'});list.append(note);}const all=host.feedback().filter(f=>readMark(f));toggle.textContent=t(host.busy?.()?'Comment · C ({0}) · Rendering':'Comment · C ({0})').replace('{0}',String(all.length));if(!all.length){const empty=document.createElement('p');empty.textContent=t(inline?'No issues yet.':reason?'Read only · Escape closes':'Mark a point or region, then type. Enter saves · Escape cancels.');list.append(empty);}for(const [i,f]of all.entries()){
|
|
@@ -117,7 +117,7 @@ export function bindStageComments<Row extends CommentRow=Feedback,Pose extends C
|
|
|
117
117
|
if(host.locked(f.id)){const submitted=document.createElement('span');submitted.textContent=t('Submitted');row.append(submitted);}
|
|
118
118
|
list.append(row);
|
|
119
119
|
}};
|
|
120
|
-
const refresh=()=>{last='';renderList();};
|
|
120
|
+
const refresh=()=>{last='';renderList();renderPins();};
|
|
121
121
|
const openComposer=(view:StageComment['viewport'],screen:MarkRegion,existing?:Row,placementMode=host.pose(view)?.mode)=>{
|
|
122
122
|
if(!existing){try{assertCapture();}catch{return;}}
|
|
123
123
|
const currentMode=host.pose(view)?.mode;
|
|
@@ -207,7 +207,7 @@ export function bindStageComments<Row extends CommentRow=Feedback,Pose extends C
|
|
|
207
207
|
const disposers:(()=>void)[]=[];
|
|
208
208
|
for(const [key,pane]of Object.entries(host.viewports)){
|
|
209
209
|
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))};};
|
|
210
|
-
const down=(e:PointerEvent)=>{if(e.button!==0||!e.isPrimary||(e.target as Element)?.closest?.('.stage-comment-ui,button,input'))return;if(enabled||!inline&&!list.hidden){try{assertCapture();}catch{return;}}if(!enabled||host.blocked())return;e.preventDefault();e.stopImmediatePropagation();cancel();const
|
|
210
|
+
const down=(e:PointerEvent)=>{if(e.button!==0||!e.isPrimary||(e.target as Element)?.closest?.('.stage-comment-ui,button,input'))return;if(enabled||!inline&&!list.hidden){try{assertCapture();}catch{return;}}if(!enabled||host.blocked())return;e.preventDefault();e.stopImmediatePropagation();cancel();const mode=host.pose(view)?.mode;if(!mode)return;const at=local(e),generation=interaction;pending={view,start:at,end:at,mode,id:e.pointerId,interaction:generation,settled:host.pause()};pending.settled.catch(e=>{if(interaction===generation&&!disposed)host.error(String(e));});pane!.setPointerCapture(e.pointerId);};
|
|
211
211
|
const move=(e:PointerEvent)=>{if(!pending||pending.id!==e.pointerId)return;e.preventDefault();e.stopImmediatePropagation();pending.end=local(e);draftMark={view,mode:pending.mode,screen:region(pending.start,pending.end)};last='';};
|
|
212
212
|
const up=async(e:PointerEvent)=>{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();}};
|
|
213
213
|
const abort=(e:PointerEvent)=>{if(pending?.view===view&&pending.id===e.pointerId)cancel();};
|