@lincyaw/workbench 0.2.0-rc.5 → 0.2.0-rc.51
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 +5 -4
- package/src/MediaClipEditor.tsx +1 -1
- package/src/audio-recording.ts +27 -5
- package/src/authoring-client.ts +10 -10
- package/src/authoring-draft-fragment.ts +3 -1
- package/src/authoring-window.ts +100 -0
- package/src/body-draft-actions.ts +60 -0
- package/src/component-property-drafts.ts +5 -5
- package/src/components.tsx +10 -28
- package/src/context.tsx +2 -1
- package/src/diagnostics.ts +1 -1
- package/src/document-draft-store.ts +45 -18
- package/src/document-drafts.ts +28 -19
- package/src/document-editing.ts +484 -0
- package/src/document-editor/BlockNoteSurface.tsx +25 -9
- package/src/document-editor/ComponentMaterials.tsx +3 -9
- package/src/document-editor/ComponentPropertiesDialog.tsx +4 -4
- package/src/document-editor/DocumentBlockPreview.tsx +4 -2
- package/src/document-editor/DocumentComments.tsx +58 -9
- package/src/document-editor/DocumentEditor.tsx +44 -7
- package/src/document-editor/DocumentStepNarration.tsx +30 -25
- package/src/document-editor/NarrationEditor.tsx +54 -20
- package/src/document-editor/NewCommentDrafts.tsx +4 -3
- package/src/document-editor/PlaceComment.tsx +150 -0
- package/src/document-editor/comment-drafts.ts +16 -14
- package/src/document-editor/comments.ts +30 -10
- package/src/document-editor/component-label.ts +11 -0
- package/src/document-editor/file-input.ts +2 -2
- package/src/document-editor/focus.ts +0 -2
- package/src/document-editor/insertion-place.ts +60 -0
- package/src/document-editor/messages.ts +3 -3
- package/src/document-editor/narration-schema.tsx +12 -6
- package/src/document-editor/narration.ts +19 -3
- package/src/document-editor/page-body.ts +60 -0
- package/src/document-editor/projection.ts +2 -2
- package/src/document-editor/rich-text.ts +3 -2
- package/src/document-editor/selection.ts +13 -0
- package/src/document-editor/style.css +12 -1
- package/src/document-editor/table-identities.ts +2 -1
- package/src/document-production.ts +339 -0
- package/src/document-session.ts +193 -53
- package/src/history.ts +5 -5
- package/src/index.ts +6 -5
- package/src/jobs.ts +1 -1
- package/src/messages.ts +19 -4
- package/src/panels/DocumentView.tsx +66 -26
- package/src/panels/DocumentVoiceDialog.tsx +2 -2
- package/src/panels/DocumentVoiceField.tsx +1 -1
- package/src/panels/ExportPanel.tsx +1 -6
- package/src/panels/HistoryPanel.tsx +1 -1
- package/src/panels/PageDeleteDialog.tsx +4 -4
- package/src/panels/PageRenameDialog.tsx +1 -1
- package/src/panels/PreviewPanel.tsx +1 -4
- package/src/panels/ProductionCaptionSize.tsx +20 -0
- package/src/panels/ProductionCaptionTiming.tsx +7 -7
- package/src/panels/ProductionMediaClips.tsx +6 -5
- package/src/panels/ProductionPanel.tsx +8 -4
- package/src/panels/ProductionRecording.tsx +86 -9
- package/src/panels/ProductionRecordingRange.tsx +19 -19
- package/src/panels/ProductionTimeline.tsx +6 -1
- package/src/panels/ProductionTranscription.tsx +5 -4
- package/src/panels/SourceDocumentPanel.tsx +12 -15
- package/src/panels/TranscriptionAdoption.tsx +9 -8
- package/src/panels/VoiceCloneDialog.tsx +2 -1
- package/src/panels/VoiceoverDialog.tsx +1 -1
- package/src/places.ts +1 -36
- package/src/preview-playback.ts +1 -1
- package/src/production-messages.ts +6 -0
- package/src/production-playback.ts +1 -1
- package/src/production-voice-playback.ts +3 -2
- package/src/sha256.ts +9 -0
- package/src/styles.css +16 -41
- package/src/use-recording-adoption.ts +2 -2
- package/src/voiceover-jobs.ts +1 -1
- package/src/workbench-state.ts +157 -0
- package/src/workbench.ts +246 -948
- package/src/workspace-client.ts +21 -11
- package/src/assistant-mascot.ts +0 -62
- package/src/mascot-preference.ts +0 -37
- package/src/panels/ChangeTrail.tsx +0 -79
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lincyaw/workbench",
|
|
3
|
-
"version": "0.2.0-rc.
|
|
3
|
+
"version": "0.2.0-rc.51",
|
|
4
4
|
"description": "Presmium's workbench panels in React (the documents, a document edited on its rendered page with comments and version history) with the workspace service's client and the preview protocol's workbench side; @lincyaw/dsh places them in presmium studio (experimental)",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -39,6 +39,7 @@
|
|
|
39
39
|
"@floating-ui/react": "0.27.20",
|
|
40
40
|
"@mantine/core": "8.3.11",
|
|
41
41
|
"@mantine/hooks": "8.3.11",
|
|
42
|
+
"@noble/hashes": "2.4.0",
|
|
42
43
|
"@radix-ui/react-dialog": "^1.3.1",
|
|
43
44
|
"@radix-ui/react-dropdown-menu": "^2.2.1",
|
|
44
45
|
"@radix-ui/react-popover": "^1.1.15",
|
|
@@ -54,8 +55,8 @@
|
|
|
54
55
|
"@tiptap/pm": "3.32.0",
|
|
55
56
|
"katex": "0.18.10",
|
|
56
57
|
"react-resizable-panels": "4.14.5",
|
|
57
|
-
"@lincyaw/
|
|
58
|
-
"@lincyaw/
|
|
58
|
+
"@lincyaw/kernel": "1.0.0-rc.51",
|
|
59
|
+
"@lincyaw/design": "1.0.0-rc.51"
|
|
59
60
|
},
|
|
60
61
|
"peerDependencies": {
|
|
61
62
|
"react": "^18.3.1",
|
|
@@ -66,6 +67,6 @@
|
|
|
66
67
|
"@types/react-dom": "18.3.7",
|
|
67
68
|
"react": "^18.3.1",
|
|
68
69
|
"react-dom": "^18.3.1",
|
|
69
|
-
"@lincyaw/compiler": "1.0.0-rc.
|
|
70
|
+
"@lincyaw/compiler": "1.0.0-rc.51"
|
|
70
71
|
}
|
|
71
72
|
}
|
package/src/MediaClipEditor.tsx
CHANGED
|
@@ -101,7 +101,7 @@ export function MediaClipEditor(props: MediaClipEditorProps) {
|
|
|
101
101
|
{rangeError && <span id={rangeErrorId} className="pm-ui-field__error" role="alert">{rangeError}</span>}
|
|
102
102
|
<PmInput label={t.offset} density={density} width="number" inputMode="decimal" maxLength={32} value={draft.offsetText ?? (clip.attachment.offsetMs / 1000).toFixed(3)}
|
|
103
103
|
readOnly={disabled || !inspected} error={offsetMs === undefined ? t.invalidOffset : undefined} onChange={event => change({ offsetText: event.target.value })} {...composition('offset')} />
|
|
104
|
-
<PmField label={t.volume} density={density} group><div className="pm-ui-
|
|
104
|
+
<PmField label={t.volume} density={density} group><div className="pm-ui-range-row">
|
|
105
105
|
<PmRange label={t.volume} density={density} value={clip.volume * 100} max={100} disabled={disabled || !inspected} valueText={value => `${Math.round(value)}%`} onPreviewChange={setVolumePreview}
|
|
106
106
|
onValueCommit={value => change({ clip: { ...clip, volume: value / 100 } })} />
|
|
107
107
|
<output>{Math.round(volumePreview ?? clip.volume * 100)}%</output><PmButton density={density} aria-pressed={Boolean(clip.muted)} disabled={disabled || !inspected} onClick={() => change({ clip: { ...clip, muted: !clip.muted } })}>{clip.muted ? t.unmute : t.mute}</PmButton>
|
package/src/audio-recording.ts
CHANGED
|
@@ -10,6 +10,21 @@ const MAX_BYTES = 16 << 20
|
|
|
10
10
|
const MAX_DURATION_MS = 10 * 60_000
|
|
11
11
|
const MIME_TYPES = ['audio/webm;codecs=opus', 'audio/ogg;codecs=opus', 'audio/mp4']
|
|
12
12
|
|
|
13
|
+
/** getUserMedia has no AbortSignal; late permission grants must release their stream. */
|
|
14
|
+
function recordingWait<T>(work: Promise<T>, signal: AbortSignal | undefined, releaseLate: (value: T) => void): Promise<T> {
|
|
15
|
+
if (!signal) return work
|
|
16
|
+
return new Promise((resolve, reject) => {
|
|
17
|
+
const abort = () => { signal.removeEventListener('abort', abort); reject(signal.reason ?? new Error('recording-cancelled')) }
|
|
18
|
+
signal.addEventListener('abort', abort, { once: true })
|
|
19
|
+
work.then(value => {
|
|
20
|
+
signal.removeEventListener('abort', abort)
|
|
21
|
+
if (signal.aborted) { releaseLate(value); return }
|
|
22
|
+
resolve(value)
|
|
23
|
+
}, error => { signal.removeEventListener('abort', abort); reject(error) })
|
|
24
|
+
if (signal.aborted) abort()
|
|
25
|
+
})
|
|
26
|
+
}
|
|
27
|
+
|
|
13
28
|
export function recordingUnavailable(): string | undefined {
|
|
14
29
|
if (!globalThis.isSecureContext || !navigator.mediaDevices?.getUserMedia) return 'recording-context'
|
|
15
30
|
if (typeof MediaRecorder === 'undefined' || !MIME_TYPES.some(type => MediaRecorder.isTypeSupported(type))) return 'recording-unsupported'
|
|
@@ -36,6 +51,7 @@ export class AudioRecording {
|
|
|
36
51
|
#generation = 0
|
|
37
52
|
#disposed = false
|
|
38
53
|
#take?: Take
|
|
54
|
+
#request?: AbortController
|
|
39
55
|
#release?: () => void
|
|
40
56
|
#warning = false
|
|
41
57
|
readonly #beforeUnload = (event: BeforeUnloadEvent) => { event.preventDefault(); event.returnValue = '' }
|
|
@@ -57,19 +73,24 @@ export class AudioRecording {
|
|
|
57
73
|
this.#set({ phase: error ? 'failed' : this.#state.candidate ? 'ready' : 'idle', candidate: this.#state.candidate, elapsedMs: this.#state.candidate?.elapsedMs ?? 0, ...error ? { error } : {} })
|
|
58
74
|
}
|
|
59
75
|
|
|
60
|
-
async start(prepare: () => Promise<() => void
|
|
76
|
+
async start(prepare: (signal: AbortSignal) => Promise<() => void>, signal?: AbortSignal): Promise<void> {
|
|
77
|
+
if (signal?.aborted) return
|
|
61
78
|
if (this.#disposed || this.#take || this.#state.phase === 'requesting') return
|
|
62
79
|
const unavailable = recordingUnavailable()
|
|
63
80
|
if (unavailable) { this.#settle(unavailable); return }
|
|
64
81
|
const generation = ++this.#generation
|
|
82
|
+
const request = this.#request = new AbortController()
|
|
83
|
+
const pendingSignal = signal ? AbortSignal.any([signal, request.signal]) : request.signal
|
|
84
|
+
const abort = () => { if (generation === this.#generation) this.cancelTake() }
|
|
85
|
+
signal?.addEventListener('abort', abort, { once: true })
|
|
65
86
|
this.#set({ ...this.#state, phase: 'requesting', error: undefined })
|
|
66
87
|
let stream: MediaStream | undefined
|
|
67
88
|
let release: (() => void) | undefined
|
|
68
89
|
try {
|
|
69
|
-
release = await prepare()
|
|
90
|
+
release = await recordingWait(prepare(pendingSignal), pendingSignal, release => release())
|
|
70
91
|
if (generation !== this.#generation) { release(); return }
|
|
71
92
|
this.#release = release
|
|
72
|
-
stream = await navigator.mediaDevices.getUserMedia({ audio: { channelCount: { ideal: 1 } }, video: false })
|
|
93
|
+
stream = await recordingWait(navigator.mediaDevices.getUserMedia({ audio: { channelCount: { ideal: 1 } }, video: false }), pendingSignal, stream => stream.getTracks().forEach(track => track.stop()))
|
|
73
94
|
if (generation !== this.#generation) { stream.getTracks().forEach(track => track.stop()); return }
|
|
74
95
|
const mimeType = MIME_TYPES.find(type => MediaRecorder.isTypeSupported(type))!
|
|
75
96
|
const recorder = new MediaRecorder(stream, { mimeType, audioBitsPerSecond: 128_000 })
|
|
@@ -102,13 +123,13 @@ export class AudioRecording {
|
|
|
102
123
|
this.#take = undefined
|
|
103
124
|
const name = error instanceof DOMException ? error.name : ''
|
|
104
125
|
this.#settle(name === 'NotAllowedError' || name === 'SecurityError' ? 'recording-permission' : name === 'NotFoundError' ? 'recording-device' : name === 'NotReadableError' ? 'recording-device-busy' : name === 'NotSupportedError' ? 'recording-device-unsupported' : 'recording-failed')
|
|
105
|
-
}
|
|
126
|
+
} finally { signal?.removeEventListener('abort', abort); if (this.#request === request) this.#request = undefined }
|
|
106
127
|
}
|
|
107
128
|
|
|
108
129
|
stop(error?: string): void {
|
|
109
130
|
const take = this.#take
|
|
110
131
|
if (!take) {
|
|
111
|
-
if (this.#state.phase === 'requesting') { this.#generation++; this.#release?.(); this.#release = undefined; this.#settle(error) }
|
|
132
|
+
if (this.#state.phase === 'requesting') { this.#generation++; this.#request?.abort(new Error('recording-cancelled')); this.#request = undefined; this.#release?.(); this.#release = undefined; this.#settle(error) }
|
|
112
133
|
return
|
|
113
134
|
}
|
|
114
135
|
if (error) take.error ??= error
|
|
@@ -159,6 +180,7 @@ export class AudioRecording {
|
|
|
159
180
|
if (this.#disposed) return
|
|
160
181
|
this.#disposed = true
|
|
161
182
|
this.#generation++
|
|
183
|
+
this.#request?.abort(new Error('recording-cancelled')); this.#request = undefined
|
|
162
184
|
const take = this.#take
|
|
163
185
|
if (take) { take.discard = true; this.stop(); this.#finish(take) }
|
|
164
186
|
this.#release?.(); this.#release = undefined
|
package/src/authoring-client.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { authoringClientResultFits } from '@lincyaw/kernel'
|
|
1
|
+
import { authoringClientActionMutatesDraft, authoringClientResultFits, randomUUID } from '@lincyaw/kernel'
|
|
2
2
|
import type { AuthoringClientActionResult, AuthoringClientEvent, AuthoringClientSnapshot, CanonicalSource } from '@lincyaw/kernel'
|
|
3
3
|
import type { Workbench } from './workbench.ts'
|
|
4
4
|
import type { AuthoringClientChannel } from './workspace-client.ts'
|
|
5
5
|
|
|
6
6
|
const sameSource = (a: CanonicalSource, b: CanonicalSource) => a.documentId === b.documentId && a.version === b.version && a.fingerprint === b.fingerprint
|
|
7
7
|
// Clock samples are observations, not user input revisions. Never push at animation-frame frequency.
|
|
8
|
-
const signature = (value: AuthoringClientSnapshot) => JSON.stringify({ ...value, revision: 0, playback: value.playback && { ...value.playback,
|
|
8
|
+
const signature = (value: AuthoringClientSnapshot) => JSON.stringify({ ...value, revision: 0, recording: value.recording && { ...value.recording, elapsedMs: 0 }, playback: value.playback && { ...value.playback,
|
|
9
9
|
position: value.playback.position && { ...value.playback.position, timeMs: 0, stepTimeMs: 0 } } })
|
|
10
10
|
type Attachment = { directory: string, identity: string, epoch: string, channel: AuthoringClientChannel, connectionId?: string }
|
|
11
11
|
|
|
@@ -13,7 +13,7 @@ type Attachment = { directory: string, identity: string, epoch: string, channel:
|
|
|
13
13
|
export function connectAuthoringClient(workbench: Workbench): () => void {
|
|
14
14
|
const open = workbench.client.openAuthoringClient
|
|
15
15
|
if (!open) return () => {}
|
|
16
|
-
const clientId =
|
|
16
|
+
const clientId = randomUUID()
|
|
17
17
|
let closed = false, revision = 0, sequence = 0
|
|
18
18
|
let attached: Attachment | undefined
|
|
19
19
|
let lastSignature: string | undefined, lastContent: object | undefined
|
|
@@ -71,7 +71,7 @@ export function connectAuthoringClient(workbench: Workbench): () => void {
|
|
|
71
71
|
if (value) publishState(owner, event.connectionId, value)
|
|
72
72
|
return
|
|
73
73
|
}
|
|
74
|
-
if (event.type === 'cancel') { if (event.connectionId === owner.connectionId && event.requestId === active?.requestId) active.controller.abort(); return }
|
|
74
|
+
if (event.type === 'cancel') { if (event.connectionId === owner.connectionId && event.requestId === active?.requestId) active.controller.abort(new Error('client-request-cancelled')); return }
|
|
75
75
|
const request = event.request, connectionId = owner.connectionId
|
|
76
76
|
if (!connectionId || request.clientId !== clientId || request.epoch !== owner.epoch || request.expectedClientState.connectionId !== connectionId || seen.has(request.requestId)) return
|
|
77
77
|
seen.add(request.requestId)
|
|
@@ -83,7 +83,7 @@ export function connectAuthoringClient(workbench: Workbench): () => void {
|
|
|
83
83
|
controller.signal.throwIfAborted()
|
|
84
84
|
if (closed || attached !== owner || owner.connectionId !== connectionId || active !== task || Date.now() >= Date.parse(event.expiresAt)) throw new Error('client-request-expired')
|
|
85
85
|
}
|
|
86
|
-
if (active || value.revision !== request.expectedClientState.revision || !sameSource(value.source, request.source) || !value.actions.includes(request.action.type) || Date.now() >= Date.parse(event.expiresAt)) {
|
|
86
|
+
if (active || value.revision !== request.expectedClientState.revision || (request.action.type === 'body-drafts.retry' ? value.source.documentId !== request.source.documentId : !sameSource(value.source, request.source)) || !value.actions.includes(request.action.type) || Date.now() >= Date.parse(event.expiresAt)) {
|
|
87
87
|
await send(owner, connectionId, value, { requestId: request.requestId, state: 'refused', error: { code: 'client-state-changed' } }).catch(() => {})
|
|
88
88
|
return
|
|
89
89
|
}
|
|
@@ -95,7 +95,7 @@ export function connectAuthoringClient(workbench: Workbench): () => void {
|
|
|
95
95
|
await send(owner, connectionId, value, { requestId: request.requestId, state: 'executing' })
|
|
96
96
|
owned()
|
|
97
97
|
const latest = snapshot()
|
|
98
|
-
if (!latest || latest.revision !== request.expectedClientState.revision || !sameSource(latest.source, request.source)) throw new Error('client-state-changed')
|
|
98
|
+
if (!latest || latest.revision !== request.expectedClientState.revision || (request.action.type === 'body-drafts.retry' ? latest.source.documentId !== request.source.documentId : !sameSource(latest.source, request.source))) throw new Error('client-state-changed')
|
|
99
99
|
const fits = (result: AuthoringClientActionResult) => authoringClientResultFits({ request, connection: { clientId, epoch: owner.epoch, connectionId }, document: owner.directory, snapshot: snapshot() ?? value }, result)
|
|
100
100
|
const actionResult = await workbench.executeAuthoringClientAction(request.action, request.source, controller.signal, expiresAt, fits)
|
|
101
101
|
owned()
|
|
@@ -104,13 +104,13 @@ export function connectAuthoringClient(workbench: Workbench): () => void {
|
|
|
104
104
|
await send(owner, connectionId, result, { requestId: request.requestId, state: 'done', ...actionResult ? { result: actionResult } : {} }, actionResult ? () => {
|
|
105
105
|
owned()
|
|
106
106
|
const latest = snapshot()
|
|
107
|
-
if (!latest || latest.revision !== result.revision || !
|
|
108
|
-
if (!fits(actionResult)) throw new Error(actionResult.family
|
|
107
|
+
if (!latest || latest.revision !== result.revision || !authoringClientActionMutatesDraft(actionResult.type) && latest.revision !== request.expectedClientState.revision) throw new Error(`client-${actionResult.family}-drafts-changed`)
|
|
108
|
+
if (!fits(actionResult)) throw new Error(`client-${actionResult.family}-result-too-large`)
|
|
109
109
|
} : undefined)
|
|
110
110
|
} catch (error) {
|
|
111
111
|
const result = snapshot()
|
|
112
112
|
const code = error instanceof Error && /^(client|production)-[a-z-]{1,100}$/.test(error.message) ? error.message : 'client-action-not-verified'
|
|
113
|
-
if (
|
|
113
|
+
if (attached === owner && owner.connectionId === connectionId && result) await send(owner, connectionId, result, { requestId: request.requestId, state: 'failed', error: { code } }).catch(() => {})
|
|
114
114
|
} finally { clearTimeout(timeout); if (active === task) active = undefined }
|
|
115
115
|
}
|
|
116
116
|
const changed = () => {
|
|
@@ -120,7 +120,7 @@ export function connectAuthoringClient(workbench: Workbench): () => void {
|
|
|
120
120
|
if (!value) { detach(); return }
|
|
121
121
|
if (attached && (attached.directory !== state.document || attached.identity !== source.identity)) detach()
|
|
122
122
|
if (!attached) {
|
|
123
|
-
const epoch =
|
|
123
|
+
const epoch = randomUUID()
|
|
124
124
|
// Callbacks run after the channel has been installed; the socket implementation is asynchronous.
|
|
125
125
|
const owner = { directory: state.document, identity: source.identity, epoch } as Attachment
|
|
126
126
|
owner.channel = open(state.document, { clientId, epoch, snapshot: value }, event => { void received(owner, event) }, () => {
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { AuthoringClientActionResult } from '@lincyaw/kernel'
|
|
2
|
+
import { sha256 as draftContentHash } from './sha256.ts'
|
|
3
|
+
|
|
4
|
+
export { draftContentHash }
|
|
2
5
|
|
|
3
6
|
type Fragment = Extract<AuthoringClientActionResult, { jsonText: string }>
|
|
4
7
|
type Fields = 'offset' | 'endOffset' | 'totalUtf16' | 'totalUtf8' | 'sha256' | 'jsonText'
|
|
5
8
|
type FragmentBase = Fragment extends infer Value ? Value extends Fragment ? Omit<Value, Fields> : never : never
|
|
6
|
-
export const draftContentHash = async (text: string): Promise<string> => [...new Uint8Array(await crypto.subtle.digest('SHA-256', new TextEncoder().encode(text)))].map(value => value.toString(16).padStart(2, '0')).join('')
|
|
7
9
|
const boundary = (text: string, offset: number) => !(offset > 0 && offset < text.length && /[\uD800-\uDBFF]/.test(text[offset - 1]!) && /[\uDC00-\uDFFF]/.test(text[offset]!))
|
|
8
10
|
|
|
9
11
|
/** Budget the complete client receipt and WS frame, preserving exact JSON text and Unicode progress. */
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { randomUUID } from '@lincyaw/kernel'
|
|
2
|
+
import type { AuthoringWindowAcknowledgement, AuthoringWindowEvent, AuthoringWindowSnapshot } from '@lincyaw/kernel'
|
|
3
|
+
import type { Workbench } from './workbench.ts'
|
|
4
|
+
|
|
5
|
+
/** One root-lifetime reader on the existing socket, independent of document attachments. */
|
|
6
|
+
export function connectAuthoringWindow(workbench: Workbench): () => void {
|
|
7
|
+
const open = workbench.client.openAuthoringWindow
|
|
8
|
+
if (!open) return () => {}
|
|
9
|
+
const clientId = randomUUID(), epoch = randomUUID(), seen = new Set<string>()
|
|
10
|
+
let closed = false, connectionId: string | undefined, revision = 0, sequence = 0, signature: string | undefined
|
|
11
|
+
const compositions = new Set<EventTarget>()
|
|
12
|
+
let inputRevision = 0, lastInputRevision = 0
|
|
13
|
+
let content: object | undefined, drafts: string | undefined, playback: number | undefined, view: string | undefined
|
|
14
|
+
let active: { requestId: string, controller: AbortController, navigation: boolean } | undefined
|
|
15
|
+
let reports: Promise<void> = Promise.resolve(), pending: AuthoringWindowSnapshot | undefined, sending = false
|
|
16
|
+
const snapshot = () => {
|
|
17
|
+
for (const target of compositions) if (target instanceof Node && !target.isConnected) compositions.delete(target)
|
|
18
|
+
const value = workbench.authoringWindowSnapshot(0), state = workbench.state, bank = workbench.authoringDraftRevision()
|
|
19
|
+
if (compositions.size) value.actions = ['window.read']
|
|
20
|
+
const next = JSON.stringify(value)
|
|
21
|
+
if (next !== signature || content !== state.authoring?.content || bank !== drafts || playback !== state.productionNavigationVersion || view !== state.webView || inputRevision !== lastInputRevision) {
|
|
22
|
+
revision++; signature = next; content = state.authoring?.content; drafts = bank; playback = state.productionNavigationVersion; view = state.webView; lastInputRevision = inputRevision
|
|
23
|
+
}
|
|
24
|
+
return { ...value, revision }
|
|
25
|
+
}
|
|
26
|
+
const send = (connection: string, value: AuthoringWindowSnapshot, acknowledgement?: Omit<AuthoringWindowAcknowledgement, 'sequence' | 'snapshot'>, guard?: () => void) => {
|
|
27
|
+
const report = { sequence: ++sequence, snapshot: value, ...acknowledgement }
|
|
28
|
+
const next = reports.then(() => {
|
|
29
|
+
if (closed || connectionId !== connection) throw new Error('window-connection-changed')
|
|
30
|
+
guard?.()
|
|
31
|
+
return acknowledgement ? channel.acknowledge(connection, report as AuthoringWindowAcknowledgement) : channel.publish(connection, report)
|
|
32
|
+
})
|
|
33
|
+
reports = next.catch(() => {}); return next
|
|
34
|
+
}
|
|
35
|
+
const publish = (value: AuthoringWindowSnapshot) => {
|
|
36
|
+
pending = value
|
|
37
|
+
if (sending) return
|
|
38
|
+
sending = true
|
|
39
|
+
void (async () => {
|
|
40
|
+
try {
|
|
41
|
+
while (pending && connectionId) { pending = undefined; const connection = connectionId; await send(connection, snapshot()).catch(() => {}) }
|
|
42
|
+
} finally { sending = false }
|
|
43
|
+
})()
|
|
44
|
+
}
|
|
45
|
+
const received = async (event: AuthoringWindowEvent) => {
|
|
46
|
+
if (closed) return
|
|
47
|
+
if (event.type === 'connected') { active?.controller.abort(); active = undefined; connectionId = event.connectionId; publish(snapshot()); return }
|
|
48
|
+
if (event.type === 'cancel') { if (event.connectionId === connectionId && active?.requestId === event.requestId) active.controller.abort(new Error('window-request-cancelled')); return }
|
|
49
|
+
const connection = connectionId, request = event.request
|
|
50
|
+
if (!connection || request.clientId !== clientId || request.epoch !== epoch || request.connectionId !== connection || seen.has(request.requestId)) return
|
|
51
|
+
seen.add(request.requestId); if (seen.size > 64) seen.delete(seen.values().next().value!)
|
|
52
|
+
const initial = snapshot()
|
|
53
|
+
if (active || initial.revision !== request.revision || !initial.actions.includes(request.action.type) || Date.now() >= Date.parse(event.expiresAt)) {
|
|
54
|
+
await send(connection, initial, { requestId: request.requestId, state: 'refused', error: { code: 'window-state-changed' } }).catch(() => {}); return
|
|
55
|
+
}
|
|
56
|
+
const controller = new AbortController(), task = { requestId: request.requestId, controller, navigation: request.action.type !== 'window.read' }
|
|
57
|
+
active = task
|
|
58
|
+
const owned = () => { controller.signal.throwIfAborted(); if (closed || connectionId !== connection || active !== task || Date.now() >= Date.parse(event.expiresAt)) throw new Error('window-request-expired') }
|
|
59
|
+
const timeout = setTimeout(() => controller.abort(new Error('window-request-expired')), Math.max(0, Date.parse(event.expiresAt) - Date.now()))
|
|
60
|
+
try {
|
|
61
|
+
await send(connection, initial, { requestId: request.requestId, state: 'executing' }, () => { owned(); if (snapshot().revision !== request.revision) throw new Error('window-state-changed') })
|
|
62
|
+
owned()
|
|
63
|
+
if (snapshot().revision !== request.revision) throw new Error('window-state-changed')
|
|
64
|
+
const outcome = await workbench.executeAuthoringWindowAction(request, controller.signal)
|
|
65
|
+
owned()
|
|
66
|
+
const result = snapshot()
|
|
67
|
+
await send(connection, result, { requestId: request.requestId, state: 'done', outcome }, () => { owned(); if (snapshot().revision !== result.revision) throw new Error('window-state-changed') })
|
|
68
|
+
} catch (error) {
|
|
69
|
+
const code = error instanceof Error && /^window-[a-z-]{1,100}$/.test(error.message) ? error.message : 'window-action-not-verified'
|
|
70
|
+
if (!closed && connectionId === connection) await send(connection, snapshot(), { requestId: request.requestId, state: 'failed', error: { code } }).catch(() => {})
|
|
71
|
+
} finally { clearTimeout(timeout); if (active === task) active = undefined }
|
|
72
|
+
}
|
|
73
|
+
const channel = open({ clientId, epoch, snapshot: snapshot() }, event => { void received(event) }, () => { connectionId = undefined; pending = undefined; active?.controller.abort(); active = undefined })
|
|
74
|
+
const changed = () => { if (closed) return; const before = revision, value = snapshot(); if (before !== revision && connectionId) publish(value) }
|
|
75
|
+
const stop = workbench.subscribe(changed), stopDrafts = workbench.subscribeAuthoringDraftChanges(changed)
|
|
76
|
+
const interrupt = () => { if (active?.navigation) active.controller.abort(new Error('window-input-changed')) }
|
|
77
|
+
const input = () => { inputRevision++; interrupt(); changed() }
|
|
78
|
+
const escape = (event: KeyboardEvent) => { if (event.key === 'Escape') interrupt() }
|
|
79
|
+
const compositionStart = (event: CompositionEvent) => { if (event.target) compositions.add(event.target); input() }
|
|
80
|
+
const compositionEnd = (event: CompositionEvent) => { if (event.target) compositions.delete(event.target); input() }
|
|
81
|
+
// Only modal semantics matter. Text mutations and iframe animation frames never trigger publications.
|
|
82
|
+
const modal = typeof MutationObserver === 'undefined' ? undefined : new MutationObserver(records => {
|
|
83
|
+
const modalChange = records.some(record => record.type === 'attributes' || [...record.addedNodes, ...record.removedNodes].some(node => {
|
|
84
|
+
return node instanceof Element && (node.matches('[role="dialog"]') || node.querySelector('[role="dialog"]'))
|
|
85
|
+
}))
|
|
86
|
+
if (modalChange || compositions.size > 0 && records.some(record => record.removedNodes.length > 0)) changed()
|
|
87
|
+
})
|
|
88
|
+
if (typeof document !== 'undefined') {
|
|
89
|
+
modal?.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['aria-modal', 'hidden', 'inert'] })
|
|
90
|
+
document.addEventListener('input', input, true); document.addEventListener('compositionstart', compositionStart, true); document.addEventListener('compositionend', compositionEnd, true)
|
|
91
|
+
document.addEventListener('pointerdown', interrupt, true); document.addEventListener('keydown', escape, true)
|
|
92
|
+
}
|
|
93
|
+
return () => {
|
|
94
|
+
closed = true; stop(); stopDrafts(); modal?.disconnect(); active?.controller.abort(); channel.close(); pending = undefined; compositions.clear()
|
|
95
|
+
if (typeof document !== 'undefined') {
|
|
96
|
+
document.removeEventListener('input', input, true); document.removeEventListener('compositionstart', compositionStart, true); document.removeEventListener('compositionend', compositionEnd, true)
|
|
97
|
+
document.removeEventListener('pointerdown', interrupt, true); document.removeEventListener('keydown', escape, true)
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import type { AuthoringClientAction, AuthoringClientActionResult, ClientBodyDraftMetadata } from '@lincyaw/kernel'
|
|
2
|
+
import { authoringDraftFragment, draftContentHash } from './authoring-draft-fragment.ts'
|
|
3
|
+
import type { BodyDraftCandidate, DocumentDraftOperation, DocumentSession, DocumentSessionState } from './document-session.ts'
|
|
4
|
+
|
|
5
|
+
type BodyAction = Extract<AuthoringClientAction, { type: `body-drafts.${string}` }>
|
|
6
|
+
/** Explicit draft inspection never sends owner IDs, base hashes or body text in metadata. */
|
|
7
|
+
const metadata = (value: BodyDraftCandidate, version: string): ClientBodyDraftMetadata => ({
|
|
8
|
+
draft: value.draft.token, current: value.draft.current, storage: value.storage, updatedAt: value.updatedAt, baseVersion: value.baseVersion, baseObserved: value.baseVersion === version,
|
|
9
|
+
composing: value.composing, pendingSubmission: value.pendingSubmission,
|
|
10
|
+
})
|
|
11
|
+
export async function executeBodyDraftAction(session: DocumentSession, state: () => DocumentSessionState | undefined, action: BodyAction, operation: DocumentDraftOperation, fits: (result: AuthoringClientActionResult) => boolean): Promise<AuthoringClientActionResult> {
|
|
12
|
+
const read = await session.readBodyDrafts(operation.signal, 'draft' in action ? action.draft : undefined)
|
|
13
|
+
const guard = () => { operation.guard(); read.guard() }
|
|
14
|
+
guard()
|
|
15
|
+
if (action.type === 'body-drafts.inspect') {
|
|
16
|
+
const values = read.candidates.map(value => metadata(value, operation.source.version)), token = await draftContentHash(JSON.stringify({ values, coverage: read.coverage }))
|
|
17
|
+
guard()
|
|
18
|
+
if (action.cursor && action.cursor.token !== token) throw new Error('client-body-drafts-changed')
|
|
19
|
+
const start = action.cursor ? values.findIndex(value => value.draft === action.cursor!.after) + 1 : 0
|
|
20
|
+
if (action.cursor && start === 0) throw new Error('client-body-drafts-changed')
|
|
21
|
+
const result: Extract<AuthoringClientActionResult, { type: 'body-drafts.inspect' }> = { type: action.type, family: 'body', coverage: read.coverage, token, drafts: [] }
|
|
22
|
+
for (const value of values.slice(start, start + (action.limit ?? 10))) {
|
|
23
|
+
const next = { ...result, drafts: [...result.drafts, value], ...start + result.drafts.length + 1 < values.length ? { next: { after: value.draft, token } } : {} }
|
|
24
|
+
if (!fits(next)) break
|
|
25
|
+
result.drafts.push(value)
|
|
26
|
+
}
|
|
27
|
+
if (start < values.length && !result.drafts.length) throw new Error('client-body-metadata-too-large')
|
|
28
|
+
if (start + result.drafts.length < values.length) result.next = { after: result.drafts.at(-1)!.draft, token }
|
|
29
|
+
if (!fits(result)) throw new Error('client-body-metadata-too-large')
|
|
30
|
+
guard(); return result
|
|
31
|
+
}
|
|
32
|
+
const value = read.candidates[0]!
|
|
33
|
+
if (action.type === 'body-drafts.read') return authoringDraftFragment({ text: JSON.stringify(value.content), base: { type: action.type, family: 'body', draft: value.draft.token, storage: value.storage, format: 'presmium-document-json-v1' }, offset: action.offset, maxChars: action.maxChars }, guard, fits)
|
|
34
|
+
if (!session.bodyDraftCapabilities().mutate || value.composing || value.pendingSubmission || action.type === 'body-drafts.restore' && value.draft.current || action.type === 'body-drafts.retry' && !value.draft.current) throw new Error('client-body-draft-needs-human')
|
|
35
|
+
const result = (outcome: Extract<AuthoringClientActionResult, { family: 'body', outcome: string }>['outcome']): Extract<AuthoringClientActionResult, { family: 'body', outcome: string }> => {
|
|
36
|
+
const now = state()
|
|
37
|
+
return { type: action.type, family: 'body', draft: value.draft.token, outcome, dirty: Boolean(now?.dirty), conflicted: Boolean(now?.error), ...now?.backupPending ? { backupPending: true as const } : {}, ...now?.storageFailure ? { backupRetained: true as const } : {} }
|
|
38
|
+
}
|
|
39
|
+
if (!fits({ ...result(action.type === 'body-drafts.restore' ? 'restored' : action.type === 'body-drafts.retry' ? 'saved' : value.draft.current ? 'source-restored' : 'backup-discarded'), backupPending: true, backupRetained: true })) throw new Error('client-body-result-too-large')
|
|
40
|
+
guard()
|
|
41
|
+
let outcome: 'restored' | 'already-saved' | 'source-restored' | 'backup-discarded' | 'saved'
|
|
42
|
+
if (action.type === 'body-drafts.restore') {
|
|
43
|
+
const restored = await session.recoverDraft(value.draft, operation)
|
|
44
|
+
if (!restored) throw new Error('client-body-drafts-changed')
|
|
45
|
+
outcome = restored
|
|
46
|
+
} else if (action.type === 'body-drafts.discard') {
|
|
47
|
+
const done = value.draft.current ? await session.discard(operation) : await session.forgetDraft(value.draft, operation)
|
|
48
|
+
if (!done) throw new Error('client-body-drafts-changed')
|
|
49
|
+
outcome = value.draft.current ? 'source-restored' : 'backup-discarded'
|
|
50
|
+
} else {
|
|
51
|
+
await session.retry(operation)
|
|
52
|
+
if (state()?.error || state()?.saving || state()?.restored) throw new Error('client-body-save-unverified')
|
|
53
|
+
outcome = 'saved'
|
|
54
|
+
}
|
|
55
|
+
operation.signal.throwIfAborted()
|
|
56
|
+
// A successful retry may finish at a new canonical version. The transport checks that saved source.
|
|
57
|
+
const answer = result(outcome)
|
|
58
|
+
if (!fits(answer)) throw new Error('client-body-result-too-large')
|
|
59
|
+
return answer
|
|
60
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { isRecord } from '@lincyaw/kernel'
|
|
1
|
+
import { isRecord, randomUUID } from '@lincyaw/kernel'
|
|
2
2
|
import type { CanonicalSource, ClientComponentDraftReference, JsonObject } from '@lincyaw/kernel'
|
|
3
3
|
import { DocumentDraftStore } from './document-draft-store.ts'
|
|
4
|
+
import { sha256 as tokenOf } from './sha256.ts'
|
|
4
5
|
import type { DraftStoreCommit } from './document-draft-store.ts'
|
|
5
6
|
|
|
6
7
|
export interface ComponentPropertyTarget { identity: string, memberId: string, blockId: string, stepId?: string }
|
|
@@ -32,7 +33,6 @@ const scopedPrefix = (kind: string, identity: string, memberId: string) => `${ki
|
|
|
32
33
|
const markerOf = (target: ComponentPropertyTarget, reference: { id: string, revision: number, token: string }) => `${markerPrefix(target)}${JSON.stringify([reference.id, reference.revision, reference.token])}`
|
|
33
34
|
const marker = (backup: ComponentPropertyBackup) => markerOf(backup.record.target, { id: backup.record.id, revision: backup.record.revision, token: backup.token })
|
|
34
35
|
const keyOf = (record: ComponentPropertyDraft) => `${prefix(record.target)}${record.id}`
|
|
35
|
-
const tokenOf = async (raw: string) => [...new Uint8Array(await crypto.subtle.digest('SHA-256', new TextEncoder().encode(raw)))].map(byte => byte.toString(16).padStart(2, '0')).join('')
|
|
36
36
|
|
|
37
37
|
function valid(value: unknown, target: ComponentPropertyTarget): value is ComponentPropertyDraft {
|
|
38
38
|
return isRecord(value) && value.format === 1 && typeof value.id === 'string' && value.id.length > 0
|
|
@@ -50,7 +50,7 @@ export class ComponentPropertyDrafts {
|
|
|
50
50
|
readonly #revisions = new Map<string, number>()
|
|
51
51
|
readonly #settling = new Map<string, number>()
|
|
52
52
|
#agentReader?: { identity: string, memberId: string, store: DocumentDraftStore }
|
|
53
|
-
readonly #writerOwner =
|
|
53
|
+
readonly #writerOwner = randomUUID()
|
|
54
54
|
#revision = 0
|
|
55
55
|
#closed = false
|
|
56
56
|
readonly #leave = (event: BeforeUnloadEvent) => {
|
|
@@ -149,7 +149,7 @@ export class ComponentPropertyDrafts {
|
|
|
149
149
|
if (this.#closed) throw new Error('component-draft-closed')
|
|
150
150
|
const key = targetKey(target), previous = this.#entries.get(key)
|
|
151
151
|
if (!previous && this.#entries.size >= 512) throw new Error('component-draft-limit')
|
|
152
|
-
const record: ComponentPropertyDraft = { format: 1, id: previous?.record.id ??
|
|
152
|
+
const record: ComponentPropertyDraft = { format: 1, id: previous?.record.id ?? randomUUID(), revision: (previous?.record.revision ?? 0) + 1,
|
|
153
153
|
target: structuredClone(target), source: structuredClone(value.source), definitionId: value.definitionId, baseline: structuredClone(value.baseline), value: structuredClone(value.value),
|
|
154
154
|
reset: Boolean(value.reset), composing: Boolean(value.composing), updatedAt: new Date().toISOString() }
|
|
155
155
|
const entry: Entry = previous ?? { record, store: new DocumentDraftStore(scope(target), undefined, { owner: this.#writerOwner, family: 'component' }), failed: false, origins: [] }
|
|
@@ -213,7 +213,7 @@ export class ComponentPropertyDrafts {
|
|
|
213
213
|
try { value = JSON.parse(raw) } catch { return false }
|
|
214
214
|
if (!valid(value, target) || backup.key !== keyOf(value)) return false
|
|
215
215
|
guard?.()
|
|
216
|
-
const record: ComponentPropertyDraft = { ...structuredClone(value), id:
|
|
216
|
+
const record: ComponentPropertyDraft = { ...structuredClone(value), id: randomUUID(), revision: 1, composing: false, updatedAt: new Date().toISOString() }
|
|
217
217
|
const fork = JSON.stringify(record)
|
|
218
218
|
if (fork.length > MAX_CHARS) return false
|
|
219
219
|
const operation = store.put(keyOf(record), fork)
|
package/src/components.tsx
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import type { IconName } from '@lincyaw/design'
|
|
2
|
-
import { mountMascot } from '@lincyaw/design/mascot'
|
|
3
|
-
import type { MascotAction } from '@lincyaw/design/mascot'
|
|
4
2
|
import * as Dialog from '@radix-ui/react-dialog'
|
|
5
3
|
import * as DropdownMenu from '@radix-ui/react-dropdown-menu'
|
|
6
4
|
import * as Popover from '@radix-ui/react-popover'
|
|
@@ -11,7 +9,6 @@ import { forwardRef, useEffect, useId, useMemo, useRef, useState } from 'react'
|
|
|
11
9
|
import type { ComponentProps, CSSProperties, InputHTMLAttributes, ReactNode, Ref, SelectHTMLAttributes, TextareaHTMLAttributes } from 'react'
|
|
12
10
|
import { Group as ResizableGroup, Panel as ResizablePanel, Separator as ResizableSeparator } from 'react-resizable-panels'
|
|
13
11
|
import { PmButton, PmIcon, PmIconButton, PmTooltip } from './base-controls.tsx'
|
|
14
|
-
import { useMascotEnabled } from './mascot-preference.ts'
|
|
15
12
|
import type { ControlDensity } from './base-controls.tsx'
|
|
16
13
|
export { PmButton, PmIcon, PmIconButton, PmTooltip } from './base-controls.tsx'
|
|
17
14
|
export type { ButtonVariant, ControlDensity } from './base-controls.tsx'
|
|
@@ -413,26 +410,6 @@ export function PmNotice({ tone = 'neutral', children }: { tone?: 'neutral' | 'a
|
|
|
413
410
|
return <div className={cls('pm-ui-notice', tone !== 'neutral' && `pm-ui-notice--${tone}`)} role={tone === 'danger' ? 'alert' : 'status'}>{children}</div>
|
|
414
411
|
}
|
|
415
412
|
|
|
416
|
-
/** The Presmium kitten acting out what the assistant or a long task is doing. It is decoration: the text beside it
|
|
417
|
-
* says the same thing for everyone, so it is hidden from assistive technology. Nothing shows when the author turned
|
|
418
|
-
* the kitten off in Settings. */
|
|
419
|
-
export function PmMascot(props: { action: MascotAction, size?: 'small' | 'regular' }) {
|
|
420
|
-
return useMascotEnabled() ? <MascotPlayer {...props} /> : null
|
|
421
|
-
}
|
|
422
|
-
|
|
423
|
-
function MascotPlayer({ action, size = 'regular' }: { action: MascotAction, size?: 'small' | 'regular' }) {
|
|
424
|
-
const ref = useRef<HTMLSpanElement>(null)
|
|
425
|
-
const player = useRef<ReturnType<typeof mountMascot>>(undefined)
|
|
426
|
-
const first = useRef(action)
|
|
427
|
-
useEffect(() => {
|
|
428
|
-
const mounted = mountMascot(ref.current!, first.current)
|
|
429
|
-
player.current = mounted
|
|
430
|
-
return () => mounted.stop()
|
|
431
|
-
}, [])
|
|
432
|
-
useEffect(() => { player.current?.set(action) }, [action])
|
|
433
|
-
return <span ref={ref} className={cls('pm-ui-mascot', size === 'small' && 'pm-ui-mascot--sm')} data-pm-mascot={action} aria-hidden="true" />
|
|
434
|
-
}
|
|
435
|
-
|
|
436
413
|
export interface RangeProps {
|
|
437
414
|
label: string
|
|
438
415
|
value: number
|
|
@@ -526,6 +503,10 @@ export interface TimelineProps {
|
|
|
526
503
|
showSteps?: boolean
|
|
527
504
|
/** A flush docked editor, with status and zoom in the same tool row. */
|
|
528
505
|
variant?: 'default' | 'editor'
|
|
506
|
+
/** The page has no place on this timeline (the lecture leaves it out): its status and notice say so, with no tracks to seek. */
|
|
507
|
+
excluded?: { status: string, notice: string }
|
|
508
|
+
/** A note about the selected step, under the tracks. */
|
|
509
|
+
notice?: string
|
|
529
510
|
}
|
|
530
511
|
|
|
531
512
|
const timelineTime = (ms: number) => `${String(Math.floor(ms / 60000)).padStart(2, '0')}:${(ms % 60000 / 1000).toFixed(3).padStart(6, '0')}`
|
|
@@ -540,11 +521,11 @@ function waveformPath(samples: readonly number[] | undefined): string | undefine
|
|
|
540
521
|
}
|
|
541
522
|
|
|
542
523
|
/** Data-only timeline; source, playback, seeking authority and all labels remain with its caller. */
|
|
543
|
-
export function PmTimeline({ label, tracks, labels, durationMs, durationStatus, currentTimeMs, selectedStepId, zoom, onZoomChange, onSelectStep, onSelectSegment, segmentPicker, onSeek, seekDisabled, disabled, loading, seeking, density = 'compact', showSteps = true, variant = 'default' }: TimelineProps) {
|
|
524
|
+
export function PmTimeline({ label, tracks, labels, durationMs, durationStatus, currentTimeMs, selectedStepId, zoom, onZoomChange, onSelectStep, onSelectSegment, segmentPicker, onSeek, seekDisabled, disabled, loading, seeking, density = 'compact', showSteps = true, variant = 'default', excluded, notice }: TimelineProps) {
|
|
544
525
|
const hintId = useId()
|
|
545
526
|
const viewport = useRef<HTMLDivElement>(null), tick = useRef<HTMLSpanElement>(null), composing = useRef(false)
|
|
546
527
|
const [width, setWidth] = useState(0), [tickWidth, setTickWidth] = useState(1), [localZoom, setLocalZoom] = useState(1), [raw, setRaw] = useState<string>(), [previewTime, setPreviewTime] = useState<number>()
|
|
547
|
-
const span = Number.isFinite(durationMs) && durationMs! >= 0 ? durationMs : undefined
|
|
528
|
+
const span = !excluded && Number.isFinite(durationMs) && durationMs! >= 0 ? durationMs : undefined
|
|
548
529
|
const timing = durationStatus ?? (span === undefined ? 'unknown' : 'confirmed')
|
|
549
530
|
const timed = span !== undefined && span > 0 && timing !== 'unknown'
|
|
550
531
|
const blocked = Boolean(disabled || loading), cannotSeek = Boolean(blocked || seeking || seekDisabled || !timed || timing !== 'confirmed')
|
|
@@ -585,10 +566,10 @@ export function PmTimeline({ label, tracks, labels, durationMs, durationStatus,
|
|
|
585
566
|
const marks = Array.from({ length: Math.min(200, Math.floor(span / unit) + 1) }, (_, index) => index * unit)
|
|
586
567
|
return [0, ...marks.filter(time => time > 0 && time < span && Math.min(time, span - time) / span * width * scale >= tickWidth), span]
|
|
587
568
|
}, [span, timed, width, scale, tickWidth])
|
|
588
|
-
const status = <div className="pm-ui-timeline__status" role="status">{loading ? labels.loading : timing === 'unknown' || span === undefined ? labels.unknown : `${timing === 'estimated' ? `${labels.estimated} · ` : ''}${timelineTime(span)}`}</div>
|
|
569
|
+
const status = <div className="pm-ui-timeline__status" role="status">{loading ? labels.loading : excluded ? excluded.status : timing === 'unknown' || span === undefined ? labels.unknown : `${timing === 'estimated' ? `${labels.estimated} · ` : ''}${timelineTime(span)}`}</div>
|
|
589
570
|
return <section className="pm-ui-timeline" data-variant={variant} data-density={density} data-disabled={blocked || undefined} data-segment-picker={segmentPicker?.track} aria-label={label} aria-busy={loading || seeking || undefined}>
|
|
590
571
|
<div className="pm-ui-timeline__tools">
|
|
591
|
-
<PmInput label={`${labels.position} (${labels.seconds})`} labelHidden={variant === 'editor'} width="time" density={density} inputMode="decimal" maxLength={32} value={raw ?? (position === undefined ? '' : (position / 1000).toFixed(3))} placeholder={labels.unknown} error={invalid ? labels.invalidPosition : undefined} disabled={cannotSeek}
|
|
572
|
+
<PmInput label={`${labels.position} (${labels.seconds})`} labelHidden={variant === 'editor'} width="time" density={density} inputMode="decimal" maxLength={32} value={raw ?? (position === undefined ? '' : (position / 1000).toFixed(3))} placeholder={excluded ? undefined : labels.unknown} error={invalid ? labels.invalidPosition : undefined} disabled={cannotSeek}
|
|
592
573
|
onChange={event => setRaw(event.target.value)} onBlur={commitPosition}
|
|
593
574
|
onCompositionStart={() => { composing.current = true }} onCompositionEnd={() => { composing.current = false }}
|
|
594
575
|
onKeyDown={event => { if (event.nativeEvent.isComposing || event.nativeEvent.keyCode === 229) return; if (event.key === 'Enter') { event.preventDefault(); commitPosition() } else if (event.key === 'Escape') setRaw(undefined) }} />
|
|
@@ -625,7 +606,8 @@ export function PmTimeline({ label, tracks, labels, durationMs, durationStatus,
|
|
|
625
606
|
<option value="">{segmentPicker.placeholder}</option>{pickerSegments.map(segment => <option key={segment.id} value={segment.id} disabled={segment.disabled}>{timelineTime(segment.startMs!)} · {segment.label}</option>)}
|
|
626
607
|
</PmSelect></div>}
|
|
627
608
|
{showSteps && <div className="pm-ui-timeline__steps">{steps.map(segment => <PmButton key={segment.stepId} density={density} disabled={blocked || segment.disabled} aria-pressed={segment.stepId === selectedStepId} variant={segment.stepId === selectedStepId ? 'accent' : 'default'} onClick={() => onSelectStep(segment.stepId!)}>{segment.label}</PmButton>)}</div>}
|
|
628
|
-
{!tracks.some(track => track.segments.length) && <PmNotice>{labels.empty}</PmNotice>}
|
|
609
|
+
{(excluded || !tracks.some(track => track.segments.length)) && <PmNotice>{excluded?.notice ?? labels.empty}</PmNotice>}
|
|
610
|
+
{notice && <PmNotice>{notice}</PmNotice>}
|
|
629
611
|
<p id={hintId} className="pm-ui-sr-only">{labels.seekHint}</p>
|
|
630
612
|
</section>
|
|
631
613
|
}
|
package/src/context.tsx
CHANGED
|
@@ -2,7 +2,8 @@ import { createContext, useContext, useSyncExternalStore } from 'react'
|
|
|
2
2
|
import type { ReactNode } from 'react'
|
|
3
3
|
import { MESSAGES } from './messages.ts'
|
|
4
4
|
import type { WorkbenchMessages } from './messages.ts'
|
|
5
|
-
import type { Workbench
|
|
5
|
+
import type { Workbench } from './workbench.ts'
|
|
6
|
+
import type { WorkbenchState } from './workbench-state.ts'
|
|
6
7
|
|
|
7
8
|
const WORKBENCH = createContext<Workbench | undefined>(undefined)
|
|
8
9
|
|
package/src/diagnostics.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { errorMessage } from '@lincyaw/kernel'
|
|
2
2
|
import type { Diagnostic, DiagnosticSnapshot, PreviewDiagnostics } from '@lincyaw/kernel'
|
|
3
|
-
import type { WorkbenchStore } from './workbench.ts'
|
|
3
|
+
import type { WorkbenchStore } from './workbench-state.ts'
|
|
4
4
|
import type { WorkspaceClient } from './workspace-client.ts'
|
|
5
5
|
|
|
6
6
|
type Repairer = (diagnostics: readonly Diagnostic[]) => void | Promise<void>
|