@lincyaw/workbench 0.2.0-rc.4 → 0.2.0-rc.40
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/authoring-client.ts +3 -3
- package/src/authoring-draft-fragment.ts +3 -1
- 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-drafts.ts +6 -7
- 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 +331 -0
- package/src/document-session.ts +50 -16
- package/src/history.ts +3 -3
- package/src/index.ts +5 -5
- package/src/jobs.ts +1 -1
- package/src/messages.ts +19 -4
- package/src/panels/DocumentView.tsx +21 -21
- 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 +7 -3
- package/src/panels/ProductionRecording.tsx +1 -1
- package/src/panels/ProductionRecordingRange.tsx +4 -4
- 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/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 +101 -932
- package/src/workspace-client.ts +2 -1
- 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.40",
|
|
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/design": "1.0.0-rc.
|
|
58
|
-
"@lincyaw/kernel": "1.0.0-rc.
|
|
58
|
+
"@lincyaw/design": "1.0.0-rc.40",
|
|
59
|
+
"@lincyaw/kernel": "1.0.0-rc.40"
|
|
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.40"
|
|
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/authoring-client.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { authoringClientResultFits } from '@lincyaw/kernel'
|
|
1
|
+
import { 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'
|
|
@@ -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
|
|
@@ -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. */
|
|
@@ -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>
|
package/src/document-drafts.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { isRecord, validateDocument } from '@lincyaw/kernel'
|
|
1
|
+
import { isRecord, randomUUID, validateDocument } from '@lincyaw/kernel'
|
|
2
2
|
import type { TeachingDocument } 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 DocumentDraftReference { id: string, revision: number, token: string }
|
|
@@ -45,14 +46,10 @@ function documentDraft(value: unknown, documentId: string): DocumentDraft | unde
|
|
|
45
46
|
return { content: checked.document, baseVersion: value.baseVersion, baseHash: value.baseHash, input: value.input,
|
|
46
47
|
pendingHash: value.pendingHash, composing: value.composing, origins: value.origins }
|
|
47
48
|
}
|
|
48
|
-
async function tokenOf(raw: string): Promise<string> {
|
|
49
|
-
const bytes = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(raw))
|
|
50
|
-
return [...new Uint8Array(bytes)].map(value => value.toString(16).padStart(2, '0')).join('')
|
|
51
|
-
}
|
|
52
49
|
|
|
53
50
|
/** Strictly committed document backups, with old localStorage copies identified as unconfirmed rescue material. */
|
|
54
51
|
export class DocumentDrafts {
|
|
55
|
-
readonly #owner =
|
|
52
|
+
readonly #owner = randomUUID()
|
|
56
53
|
readonly #owned = new Map<string, { identity: string, revision: number, raw: string }>()
|
|
57
54
|
#store?: DocumentDraftStore
|
|
58
55
|
#identity?: string
|
|
@@ -96,6 +93,8 @@ export class DocumentDrafts {
|
|
|
96
93
|
|| typeof value.owner !== 'string' || !value.owner || value.owner.length > 200 || typeof value.updatedAt !== 'number' || !Number.isSafeInteger(value.updatedAt) || value.updatedAt < 0 || Number.isNaN(new Date(value.updatedAt).getTime())) throw new Error('document-draft-data')
|
|
97
94
|
const draft = documentDraft(value, documentId)
|
|
98
95
|
if (!draft) throw new Error('document-draft-document')
|
|
96
|
+
if (draft.baseHash.startsWith('json:')) draft.baseHash = await tokenOf(draft.baseHash.slice(5))
|
|
97
|
+
if (draft.pendingHash?.startsWith('json:')) draft.pendingHash = await tokenOf(draft.pendingHash.slice(5))
|
|
99
98
|
const token = await tokenOf(raw), marker = settledKey(identity, { id: value.id, revision: value.revision, token })
|
|
100
99
|
if (durable.get(marker) === token) continue
|
|
101
100
|
if (source === 'rescue' && localStorage.getItem(marker) === token) continue
|
|
@@ -113,7 +112,7 @@ export class DocumentDrafts {
|
|
|
113
112
|
const owned = previous && this.#owned.get(previous.id)
|
|
114
113
|
if (previous && (!owned || owned.identity !== identity || previous.owner !== this.#owner || previous.revision !== owned.revision)) return
|
|
115
114
|
const changed = previous && store.conflicted(keyOf(identity, previous.id))
|
|
116
|
-
const record: StoredDocumentDraft = { ...draft, format: 2, identity, id: !changed && previous ? previous.id :
|
|
115
|
+
const record: StoredDocumentDraft = { ...draft, format: 2, identity, id: !changed && previous ? previous.id : randomUUID(), owner: this.#owner, revision: changed ? 1 : (owned?.revision ?? 0) + 1, updatedAt: Date.now() }
|
|
117
116
|
if (!Number.isSafeInteger(record.revision)) return
|
|
118
117
|
try { const raw = JSON.stringify(record); return raw.length <= MAX_CHARS ? { record, raw } : undefined }
|
|
119
118
|
catch { return }
|