Skip to content

armgit / mimik

Public Imported from GitHub
0

🎬 A browser extension and desktop app that turns your clicks into step-by-step guides with annotated screenshots 📖

feat(ui): redesign the video preview on light cards, with a mascot loader that moves from voice-over to video

Luis Ortizf0eecff80771
diff --git a/packages/core/src/export/video-export.ts b/packages/core/src/export/video-export.ts
index d663e6e..6888180 100644
--- a/packages/core/src/export/video-export.ts
+++ b/packages/core/src/export/video-export.ts
@@ -691,7 +691,7 @@ export type FrameOptions = Pick<ExportOptions, 'cover' | 'stepDescriptions'> & {
export interface VideoExportControls {
onProgress?: (done: number, total: number) => void;
- onVoiceProgress?: (done: number, total: number) => void;
+ onVoiceProgress?: (done: number, total: number, next?: string) => void;
onMuxProgress?: (done: number, total: number) => void;
signal?: AbortSignal;
}
diff --git a/packages/core/src/export/voiceover/render.ts b/packages/core/src/export/voiceover/render.ts
index a1707d4..6c491cc 100644
--- a/packages/core/src/export/voiceover/render.ts
+++ b/packages/core/src/export/voiceover/render.ts
@@ -7,7 +7,7 @@ import type { VoiceoverSegment } from './script';
export interface VoiceoverControls {
signal?: AbortSignal;
- onProgress?: (done: number, total: number) => void;
+ onProgress?: (done: number, total: number, next?: string) => void;
}
const RETRY_DELAY_MS = 1500;
@@ -62,12 +62,12 @@ export async function renderVoiceover(
const clips = new Map<number, AudioBuffer>();
let done = 0;
- onProgress?.(0, segments.length);
+ onProgress?.(0, segments.length, segments[0]?.text);
for (const segment of segments) {
if (signal?.aborted) throw new DOMException('Voiceover was aborted', 'AbortError');
clips.set(segment.index, await decodeClip(await clipBytes(segment, config, signal)));
- onProgress?.(++done, segments.length);
+ onProgress?.(++done, segments.length, segments[done]?.text);
}
return clips;
diff --git a/packages/ui/src/export/components/ExportPreviewModal.tsx b/packages/ui/src/export/components/ExportPreviewModal.tsx
index f28c310..68ae47a 100644
--- a/packages/ui/src/export/components/ExportPreviewModal.tsx
+++ b/packages/ui/src/export/components/ExportPreviewModal.tsx
@@ -21,6 +21,7 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from '../../componen
import { type ExportFormat, useGuideExport } from '../hooks/use-guide-export';
import { useVideoPreview } from '../hooks/use-video-preview';
import { useVoiceoverReady } from '../hooks/use-voiceover-ready';
+import { VideoLoader } from './VideoLoader';
const VideoStepPlayer = lazy(() => import('./VideoStepPlayer').then((m) => ({ default: m.VideoStepPlayer })));
@@ -337,7 +338,7 @@ export function ExportPreviewModal({ open, onOpenChange, guide, steps, screensho
</div>
)}
- <div className="flex-1 bg-[#3F3F46] relative overflow-hidden">
+ <div className={`flex-1 relative overflow-hidden ${mode === 'document' ? 'bg-[#3F3F46]' : 'bg-secondary'}`}>
{mode === 'document' ? (
<>
{doc.rendering && (
@@ -392,25 +393,12 @@ export function ExportPreviewModal({ open, onOpenChange, guide, steps, screensho
/>
</Suspense>
) : (
- <div className="flex flex-col items-center gap-2 bg-card border border-border rounded-xl px-4 py-3">
- <div className="text-[11px] text-muted-foreground">
- {video.narrating
- ? i18n.t('exportPreview.narrating', [
- String(video.narrating.done + 1),
- String(video.narrating.total),
- ])
- : i18n.t('exportPreview.encodingVideo')}
- </div>
- <div className="h-1.5 w-40 overflow-hidden rounded-full bg-border">
- <div
- className="h-full rounded-full bg-accent transition-[width] duration-150"
- style={{ width: `${Math.round(video.progress * 100)}%` }}
- />
- </div>
- <div className="text-[10px] font-semibold tabular-nums text-foreground">
- {Math.round(video.progress * 100)}%
- </div>
- </div>
+ <VideoLoader
+ stage={video.stage}
+ narrating={video.narrating}
+ progress={video.progress}
+ stepCount={steps.length}
+ />
)}
</div>
)}
diff --git a/packages/ui/src/export/components/LoaderMascot.tsx b/packages/ui/src/export/components/LoaderMascot.tsx
new file mode 100644
index 0000000..7143760
--- /dev/null
+++ b/packages/ui/src/export/components/LoaderMascot.tsx
@@ -0,0 +1,79 @@
+import {
+ CAMERA_MASCOT_DROP,
+ CAMERA_MASCOT_PARTS,
+ CAMERA_MASCOT_VIEW_BOX,
+ MASCOT_BODY,
+ MASCOT_CROWN,
+ MASCOT_CROWN_SPLIT,
+ MASCOT_FACES,
+ MASCOT_SEAM,
+} from '../../common/lib/mascot-shapes';
+
+const WAVES = ['M6 20 Q12 28 6 36', 'M16 12 Q26 28 16 44', 'M26 4 Q40 28 26 52'];
+const MOVE = 'transition duration-500 ease-[cubic-bezier(.2,.9,.3,1.2)] motion-reduce:transition-none';
+
+export function LoaderMascot({ filming, size = 128 }: { filming: boolean; size?: number }) {
+ const face = MASCOT_FACES.happy;
+ const camera = CAMERA_MASCOT_PARTS;
+ return (
+ <span className="relative inline-flex" aria-hidden="true">
+ <svg viewBox={CAMERA_MASCOT_VIEW_BOX} width={size} height={size} fill="none">
+ <defs>
+ <clipPath id="loader-mascot-crown">
+ <path d={MASCOT_CROWN_SPLIT} />
+ </clipPath>
+ </defs>
+ <g className={MOVE} style={{ transform: `translateY(${filming ? CAMERA_MASCOT_DROP : 0}px)` }}>
+ <rect {...MASCOT_BODY} className="fill-primary" />
+ <path d={MASCOT_CROWN} className="fill-violet-mid" />
+ <path d={MASCOT_CROWN} className="fill-mascot" clipPath="url(#loader-mascot-crown)" />
+ <rect {...MASCOT_SEAM} className="fill-lavender" />
+ {face.eyes.map((eye) => (
+ <path
+ key={eye}
+ d={eye}
+ className="stroke-lavender"
+ strokeWidth={face.eyeWidth}
+ fill="none"
+ strokeLinecap="round"
+ />
+ ))}
+ <g className={`transition-opacity duration-300 ${filming ? 'opacity-0' : 'opacity-100'}`}>
+ <ellipse cx="100" cy="142" rx="11" ry="6" className="fill-lavender animate-talk [transform-box:fill-box]" />
+ </g>
+ <path
+ d={face.mouth}
+ className={`stroke-lavender transition-opacity duration-300 ${filming ? 'opacity-100 delay-200' : 'opacity-0'}`}
+ strokeWidth={face.mouthWidth}
+ fill="none"
+ strokeLinecap="round"
+ />
+ </g>
+ <g className={MOVE} style={{ opacity: filming ? 1 : 0, transform: `translateY(${filming ? 0 : -70}px)` }}>
+ <rect {...camera.body} className="fill-violet-mid stroke-violet-mid" strokeWidth={2} />
+ <circle {...camera.lensRing} className="fill-primary stroke-violet-mid" strokeWidth={2} />
+ <circle {...camera.lens} fill="#080818" />
+ <circle {...camera.glint} className="fill-lavender" opacity={0.4} />
+ <rect {...camera.flashUnit} className="fill-lavender" opacity={0.7} />
+ <circle {...camera.flash} className="fill-lavender animate-[cam-flash_3s_ease_infinite]" />
+ <circle {...camera.light} className="fill-mascot" />
+ {camera.hands.map((hand) => (
+ <ellipse key={hand.cx} {...hand} className="fill-primary" />
+ ))}
+ </g>
+ </svg>
+ <svg
+ viewBox="0 0 40 56"
+ width={Math.round(size * 0.3)}
+ className={`absolute left-full top-[40%] -ml-2 stroke-primary ${MOVE} ${filming ? '-translate-x-3 opacity-0' : 'opacity-100'}`}
+ fill="none"
+ strokeWidth={3}
+ strokeLinecap="round"
+ >
+ {WAVES.map((d, i) => (
+ <path key={d} d={d} className="animate-wave" style={{ animationDelay: `${i * 200}ms` }} />
+ ))}
+ </svg>
+ </span>
+ );
+}
diff --git a/packages/ui/src/export/components/PlayerBody.tsx b/packages/ui/src/export/components/PlayerBody.tsx
index 6973bb3..2e6ecb8 100644
--- a/packages/ui/src/export/components/PlayerBody.tsx
+++ b/packages/ui/src/export/components/PlayerBody.tsx
@@ -1,5 +1,6 @@
import { i18n } from '@mimik/core/env';
import type { VideoChapter } from '@mimik/core/export/video-export';
+import { FRAME_FILL } from '@mimik/core/export/video-support';
import {
FullscreenButton,
MediaProvider,
@@ -12,9 +13,13 @@ import { ChevronLeft, ChevronRight, Maximize, Minimize, Pause, Play, Volume2, Vo
import { activeIndex } from '../lib/active-index';
import { formatClock } from '../lib/format-clock';
import { StepList } from './StepList';
+import { StepTimeline } from './StepTimeline';
const RATES = [1, 1.25, 1.5, 2];
+const ICON_BUTTON =
+ 'flex size-[34px] items-center justify-center rounded-lg text-foreground hover:bg-secondary disabled:opacity-35 disabled:hover:bg-transparent';
+
export function PlayerBody({ chapters, narrated }: { chapters: VideoChapter[]; narrated: boolean }) {
const remote = useMediaRemote();
const time = useMediaState('currentTime');
@@ -29,12 +34,21 @@ export function PlayerBody({ chapters, narrated }: { chapters: VideoChapter[]; n
const jump = (i: number) => chapters[i] && seekTo(chapters[i].start);
return (
- <>
- <div className="relative min-w-0 flex-1">
- <MediaProvider className="size-full [&_video]:size-full [&_video]:object-contain" />
+ <div className="flex size-full gap-4 bg-secondary p-4">
+ <div className="flex min-w-0 flex-1 flex-col gap-3 rounded-[14px] border border-border bg-card p-4">
+ <div className="flex min-h-0 flex-1 items-center justify-center" style={{ containerType: 'size' }}>
+ <div
+ className="overflow-hidden rounded-[10px]"
+ style={{ width: 'min(100cqw, 100cqh * 16 / 9)', aspectRatio: '16 / 9', backgroundColor: FRAME_FILL }}
+ >
+ <MediaProvider className="size-full [&_video]:size-full [&_video]:object-contain" />
+ </div>
+ </div>
+
+ {chapters.length > 0 && <StepTimeline chapters={chapters} time={time} onJump={jump} />}
- <div className="absolute inset-x-0 bottom-0 flex items-center gap-2 bg-gradient-to-t from-black/85 to-transparent px-3 pb-2.5 pt-8 text-white">
- <PlayButton className="rounded-md p-1 hover:bg-white/15">
+ <div className="flex items-center gap-2">
+ <PlayButton className="flex size-[38px] items-center justify-center rounded-full bg-primary text-primary-foreground hover:bg-primary/90">
{paused ? <Play size={16} fill="currentColor" /> : <Pause size={16} fill="currentColor" />}
</PlayButton>
@@ -43,7 +57,7 @@ export function PlayerBody({ chapters, narrated }: { chapters: VideoChapter[]; n
disabled={index <= 0}
onClick={() => jump(index - 1)}
aria-label={i18n.t('videoPlayer.previousStep')}
- className="rounded-md p-1 hover:bg-white/15 disabled:opacity-35 disabled:hover:bg-transparent"
+ className={ICON_BUTTON}
>
<ChevronLeft size={16} />
</button>
@@ -52,12 +66,12 @@ export function PlayerBody({ chapters, narrated }: { chapters: VideoChapter[]; n
disabled={index < 0 || index >= chapters.length - 1}
onClick={() => jump(index + 1)}
aria-label={i18n.t('videoPlayer.nextStep')}
- className="rounded-md p-1 hover:bg-white/15 disabled:opacity-35 disabled:hover:bg-transparent"
+ className={ICON_BUTTON}
>
<ChevronRight size={16} />
</button>
- <span className="font-mono text-[11px] tabular-nums text-white/75">
+ <span className="font-mono text-[11px] tabular-nums text-muted-foreground">
{formatClock(time)} / {formatClock(duration)}
</span>
@@ -67,19 +81,19 @@ export function PlayerBody({ chapters, narrated }: { chapters: VideoChapter[]; n
type="button"
onClick={() => remote.changePlaybackRate(RATES[(RATES.indexOf(rate) + 1) % RATES.length])}
aria-label={i18n.t('videoPlayer.speed')}
- className="rounded-md px-1.5 py-1 font-mono text-[11px] tabular-nums hover:bg-white/15"
+ className="h-7 rounded-full border border-border px-2.5 font-mono text-[11px] tabular-nums text-foreground hover:bg-secondary"
>
{rate}x
</button>
<MuteButton
- className="rounded-md p-1 hover:bg-white/15"
+ className={ICON_BUTTON}
aria-label={muted ? i18n.t('videoPlayer.unmute') : i18n.t('videoPlayer.mute')}
>
{muted ? <VolumeX size={16} /> : <Volume2 size={16} />}
</MuteButton>
- <FullscreenButton className="rounded-md p-1 hover:bg-white/15">
+ <FullscreenButton className={ICON_BUTTON}>
{fullscreen ? <Minimize size={16} /> : <Maximize size={16} />}
</FullscreenButton>
</div>
@@ -88,6 +102,6 @@ export function PlayerBody({ chapters, narrated }: { chapters: VideoChapter[]; n
{chapters.length > 0 && (
<StepList chapters={chapters} index={index} narrated={narrated} playing={!paused} onJump={jump} />
)}
- </>
+ </div>
);
}
diff --git a/packages/ui/src/export/components/SpokenMark.tsx b/packages/ui/src/export/components/SpokenMark.tsx
index ccc0b52..dae4f31 100644
--- a/packages/ui/src/export/components/SpokenMark.tsx
+++ b/packages/ui/src/export/components/SpokenMark.tsx
@@ -4,11 +4,11 @@ const WAVE_BARS = [3, 7, 4, 8, 5];
export function SpokenMark({ talking }: { talking: boolean }) {
return (
- <span role="img" aria-label={i18n.t('videoPlayer.spoken')} className="mt-1 flex shrink-0 items-center gap-[2px]">
+ <span role="img" aria-label={i18n.t('videoPlayer.spoken')} className="flex shrink-0 items-center gap-[2px]">
{WAVE_BARS.map((height, i) => (
<span
key={height}
- className={`w-[2px] rounded-[1px] ${talking ? 'animate-talk bg-lavender' : 'bg-lavender/70'}`}
+ className={`w-[2px] rounded-[1px] ${talking ? 'animate-talk bg-primary' : 'bg-muted-foreground/60'}`}
style={{ height: `${height}px`, animationDelay: talking ? `${i * 90}ms` : undefined }}
/>
))}
diff --git a/packages/ui/src/export/components/StepKindBadge.tsx b/packages/ui/src/export/components/StepKindBadge.tsx
new file mode 100644
index 0000000..19d14b7
--- /dev/null
+++ b/packages/ui/src/export/components/StepKindBadge.tsx
@@ -0,0 +1,20 @@
+import { i18n } from '@mimik/core/env';
+import type { StepKind } from '@mimik/core/export/video-export';
+
+const STYLES: Record<StepKind, string> = {
+ click: 'border border-border text-foreground',
+ type: 'border border-violet-light/50 bg-violet-light/10 text-violet-mid',
+ key: 'bg-secondary text-foreground',
+ navigate: 'border border-dashed border-border text-muted-foreground',
+ note: 'bg-muted text-muted-foreground',
+};
+
+export function StepKindBadge({ kind }: { kind: StepKind }) {
+ return (
+ <span
+ className={`inline-block leading-none text-[9px] font-bold uppercase tracking-wide rounded px-1 py-[2px] shrink-0 ${STYLES[kind]}`}
+ >
+ {i18n.t(`stepKind.${kind}`)}
+ </span>
+ );
+}
diff --git a/packages/ui/src/export/components/StepList.tsx b/packages/ui/src/export/components/StepList.tsx
index 858d5af..07d5a84 100644
--- a/packages/ui/src/export/components/StepList.tsx
+++ b/packages/ui/src/export/components/StepList.tsx
@@ -1,16 +1,9 @@
import { i18n } from '@mimik/core/env';
-import type { StepKind, VideoChapter } from '@mimik/core/export/video-export';
+import type { VideoChapter } from '@mimik/core/export/video-export';
import { useEffect, useRef } from 'react';
import { formatClock } from '../lib/format-clock';
import { SpokenMark } from './SpokenMark';
-
-const KIND_DOT: Record<StepKind, string> = {
- click: 'bg-accent',
- type: 'bg-violet-light',
- key: 'bg-violet',
- navigate: 'bg-lavender',
- note: 'bg-muted-foreground',
-};
+import { StepKindBadge } from './StepKindBadge';
export function StepList({
chapters,
@@ -32,23 +25,48 @@ export function StepList({
}, [index]);
return (
- <aside ref={list} className="w-[228px] shrink-0 overflow-y-auto border-l border-white/10 bg-deep">
- <div className="px-3 pb-2 pt-3 font-mono text-[9px] uppercase tracking-[0.1em] text-white/45">
- {i18n.t('videoPlayer.stepCount', [String(chapters.length)])}
+ <aside
+ ref={list}
+ className="flex w-[290px] shrink-0 flex-col overflow-hidden rounded-[14px] border border-border bg-card"
+ >
+ <div className="flex items-baseline justify-between px-4 pb-2 pt-3.5">
+ <span className="text-xs font-bold text-foreground">
+ {i18n.t('videoPlayer.stepCount', [String(chapters.length)])}
+ </span>
+ <span className="font-mono text-[10px] tabular-nums text-muted-foreground">
+ {formatClock(chapters[chapters.length - 1]?.end ?? 0)}
+ </span>
+ </div>
+ <div className="min-h-0 flex-1 overflow-y-auto pb-2">
+ {chapters.map((chapter, i) => (
+ <button
+ key={chapter.stepId}
+ type="button"
+ onClick={() => onJump(i)}
+ className={`flex w-full items-start gap-2.5 px-3.5 py-1.5 text-left transition-colors ${
+ i === index ? 'bg-secondary' : 'hover:bg-secondary/50'
+ }`}
+ >
+ <span
+ className={`mt-px flex size-5 shrink-0 items-center justify-center rounded-full text-[10px] font-bold ${
+ i === index ? 'bg-primary text-primary-foreground' : 'bg-secondary text-foreground'
+ }`}
+ >
+ {i + 1}
+ </span>
+ <span className="flex min-w-0 flex-1 flex-col gap-1">
+ <span className="text-[11.5px] leading-snug text-foreground">{chapter.title}</span>
+ <span className="flex items-center gap-1.5">
+ <StepKindBadge kind={chapter.kind} />
+ {narrated && chapter.spoken && <SpokenMark talking={playing && i === index} />}
+ </span>
+ </span>
+ <span className="pt-0.5 font-mono text-[9px] tabular-nums text-muted-foreground">
+ {formatClock(chapter.start)}
+ </span>
+ </button>
+ ))}
</div>
- {chapters.map((chapter, i) => (
- <button
- key={chapter.stepId}
- type="button"
- onClick={() => onJump(i)}
- className={`flex w-full items-start gap-2.5 border-l-2 px-3 py-1.5 text-left transition-colors ${i === index ? 'border-l-accent bg-white/10' : 'border-l-transparent hover:bg-white/5'}`}
- >
- <span className={`mt-1.5 size-1.5 shrink-0 rounded-full ${KIND_DOT[chapter.kind]}`} />
- <span className="min-w-0 flex-1 text-[10.5px] leading-snug text-white/80">{chapter.title}</span>
- {narrated && chapter.spoken && <SpokenMark talking={playing && i === index} />}
- <span className="pt-0.5 font-mono text-[9px] tabular-nums text-white/40">{formatClock(chapter.start)}</span>
- </button>
- ))}
</aside>
);
}
diff --git a/packages/ui/src/export/components/StepTimeline.tsx b/packages/ui/src/export/components/StepTimeline.tsx
new file mode 100644
index 0000000..61a1d00
--- /dev/null
+++ b/packages/ui/src/export/components/StepTimeline.tsx
@@ -0,0 +1,30 @@
+import type { VideoChapter } from '@mimik/core/export/video-export';
+import { stepSegments } from '../lib/step-segments';
+
+interface StepTimelineProps {
+ chapters: VideoChapter[];
+ time: number;
+ onJump: (index: number) => void;
+}
+
+export function StepTimeline({ chapters, time, onJump }: StepTimelineProps) {
+ return (
+ <div className="flex gap-[3px]">
+ {stepSegments(chapters, time).map((segment, i) => (
+ <button
+ key={chapters[i].stepId}
+ type="button"
+ aria-label={chapters[i].title}
+ title={chapters[i].title}
+ onClick={() => onJump(i)}
+ className="group flex h-4 min-w-1 items-center"
+ style={{ flexGrow: segment.weight, flexBasis: 0 }}
+ >
+ <span className="block h-1.5 w-full overflow-hidden rounded-full bg-border group-hover:bg-lavender">
+ <span className="block h-full bg-primary" style={{ width: `${segment.played * 100}%` }} />
+ </span>
+ </button>
+ ))}
+ </div>
+ );
+}
diff --git a/packages/ui/src/export/components/VideoLoader.tsx b/packages/ui/src/export/components/VideoLoader.tsx
new file mode 100644
index 0000000..5ee0fc9
--- /dev/null
+++ b/packages/ui/src/export/components/VideoLoader.tsx
@@ -0,0 +1,71 @@
+import { i18n } from '@mimik/core/env';
+import type { VideoPreview } from '../hooks/use-video-preview';
+import { LoaderMascot } from './LoaderMascot';
+
+interface VideoLoaderProps {
+ stage: VideoPreview['stage'];
+ narrating: VideoPreview['narrating'];
+ progress: number;
+ stepCount: number;
+}
+
+const FRAMES = Array.from({ length: 8 }, (_, i) => i);
+
+export function VideoLoader({ stage, narrating, progress, stepCount }: VideoLoaderProps) {
+ const percent = Math.round(progress * 100);
+ const filming = stage === 'video';
+ const title = filming
+ ? i18n.t('exportPreview.encodingVideo')
+ : narrating
+ ? i18n.t('exportPreview.narrating', [
+ String(Math.min(narrating.done + 1, narrating.total)),
+ String(narrating.total),
+ ])
+ : i18n.t('exportPreview.preparingVoiceover');
+ const detail =
+ !filming && narrating?.text ? `“${narrating.text}”` : i18n.t('videoPlayer.stepCount', [String(stepCount)]);
+
+ return (
+ <div className="flex w-[380px] max-w-[90%] flex-col items-center gap-4 text-center">
+ <div className="flex size-[150px] items-center justify-center rounded-full bg-lavender">
+ <LoaderMascot filming={filming} />
+ </div>
+
+ <div
+ className={`relative h-[34px] w-[260px] overflow-hidden rounded bg-primary transition duration-500 motion-reduce:transition-none ${
+ filming ? 'opacity-100' : '-translate-y-2.5 opacity-0'
+ }`}
+ aria-hidden="true"
+ >
+ <div className="absolute inset-y-0 left-0 flex items-center gap-1 px-1 animate-reel">
+ {FRAMES.map((frame) => (
+ <span key={frame} className="relative block h-[22px] w-12 rounded-[3px] bg-violet-mid">
+ <span className="absolute left-1.5 top-1.5 block h-2.5 w-5 rounded-sm bg-lavender/35" />
+ </span>
+ ))}
+ </div>
+ </div>
+
+ <div key={stage} className="flex min-h-12 flex-col items-center gap-1 animate-rise">
+ <p className="text-[15px] font-semibold text-foreground">{title}</p>
+ <p className="line-clamp-2 text-xs leading-relaxed text-muted-foreground">{detail}</p>
+ </div>
+
+ <div
+ role="progressbar"
+ aria-valuemin={0}
+ aria-valuemax={100}
+ aria-valuenow={percent}
+ className="flex w-full items-center gap-2.5"
+ >
+ <div className="h-1.5 flex-1 overflow-hidden rounded-full bg-border">
+ <div
+ className="h-full rounded-full bg-primary transition-[width] duration-150"
+ style={{ width: `${percent}%` }}
+ />
+ </div>
+ <span className="w-9 text-right font-mono text-xs tabular-nums text-foreground">{percent}%</span>
+ </div>
+ </div>
+ );
+}
diff --git a/packages/ui/src/export/components/VideoStepPlayer.tsx b/packages/ui/src/export/components/VideoStepPlayer.tsx
index ff8e17c..c4366bf 100644
--- a/packages/ui/src/export/components/VideoStepPlayer.tsx
+++ b/packages/ui/src/export/components/VideoStepPlayer.tsx
@@ -1,5 +1,4 @@
import type { VideoChapter } from '@mimik/core/export/video-export';
-import { FRAME_FILL } from '@mimik/core/export/video-support';
import { MediaPlayer } from '@vidstack/react';
import type { VideoMime } from '../types';
import { PlayerBody } from './PlayerBody';
@@ -22,7 +21,6 @@ export function VideoStepPlayer({ src, type, chapters, narrated = false }: Video
viewType="video"
streamType="on-demand"
className="flex size-full"
- style={{ backgroundColor: FRAME_FILL }}
>
<PlayerBody chapters={chapters} narrated={narrated} />
</MediaPlayer>
diff --git a/packages/ui/src/export/hooks/use-video-preview.ts b/packages/ui/src/export/hooks/use-video-preview.ts
index 4c9964f..d49b6d1 100644
--- a/packages/ui/src/export/hooks/use-video-preview.ts
+++ b/packages/ui/src/export/hooks/use-video-preview.ts
@@ -14,7 +14,8 @@ export interface VideoPreview {
mime: VideoMime;
chapters: VideoChapter[];
progress: number;
- narrating: { done: number; total: number } | null;
+ stage: 'voice' | 'video';
+ narrating: { done: number; total: number; text?: string } | null;
voiceoverError: VoiceoverSkip | null;
error: string | null;
deferred: boolean;
@@ -36,7 +37,8 @@ export function useVideoPreview({ active, guide, steps, screenshots, options, vo
const [mime, setMime] = useState<VideoMime>('video/mp4');
const [chapters, setChapters] = useState<VideoChapter[]>([]);
const [progress, setProgress] = useState(0);
- const [narrating, setNarrating] = useState<{ done: number; total: number } | null>(null);
+ const [stage, setStage] = useState<'voice' | 'video'>('video');
+ const [narrating, setNarrating] = useState<{ done: number; total: number; text?: string } | null>(null);
const [voiceoverError, setVoiceoverError] = useState<VoiceoverSkip | null>(null);
const [error, setError] = useState<string | null>(null);
const [requested, setRequested] = useState(false);
@@ -66,6 +68,7 @@ export function useVideoPreview({ active, guide, steps, screenshots, options, vo
let made: string | null = null;
setError(null);
setProgress(0);
+ setStage(voiceover ? 'voice' : 'video');
setNarrating(null);
setVoiceoverError(null);
const timer = setTimeout(async () => {
@@ -81,15 +84,15 @@ export function useVideoPreview({ active, guide, steps, screenshots, options, vo
signal: controller.signal,
onProgress: (encoded, frames) => {
if (controller.signal.aborted) return;
- setNarrating(null);
+ setStage('video');
setProgress(
exportProgress.encode(encoded, frames, allClipsLanded ? voiceShare : 0, allClipsLanded ? muxShare : 0),
);
},
- onVoiceProgress: (done, total) => {
+ onVoiceProgress: (done, total, text) => {
if (controller.signal.aborted) return;
allClipsLanded = done === total;
- setNarrating(done < total ? { done, total } : null);
+ setNarrating({ done, total, text });
setProgress(exportProgress.narrate(done, total, voiceShare));
},
onMuxProgress: (done, total) => {
@@ -122,6 +125,7 @@ export function useVideoPreview({ active, guide, steps, screenshots, options, vo
mime,
chapters,
progress,
+ stage,
narrating,
voiceoverError,
error,
diff --git a/packages/ui/src/export/lib/__tests__/step-segments.test.ts b/packages/ui/src/export/lib/__tests__/step-segments.test.ts
new file mode 100644
index 0000000..7526b8d
--- /dev/null
+++ b/packages/ui/src/export/lib/__tests__/step-segments.test.ts
@@ -0,0 +1,22 @@
+import type { VideoChapter } from '@mimik/core/export/video-export';
+import { describe, expect, it } from 'vitest';
+import { stepSegments } from '../step-segments';
+
+const chapter = (start: number, end: number): VideoChapter => ({
+ stepId: `s${start}`,
+ title: '',
+ kind: 'click',
+ start,
+ end,
+ spoken: false,
+});
+
+describe('stepSegments', () => {
+ it('sizes each step by its length and fills the ones already played', () => {
+ expect(stepSegments([chapter(0, 4), chapter(4, 12), chapter(12, 14)], 8)).toEqual([
+ { weight: 4, played: 1 },
+ { weight: 8, played: 0.5 },
+ { weight: 2, played: 0 },
+ ]);
+ });
+});
diff --git a/packages/ui/src/export/lib/step-segments.ts b/packages/ui/src/export/lib/step-segments.ts
new file mode 100644
index 0000000..95e4141
--- /dev/null
+++ b/packages/ui/src/export/lib/step-segments.ts
@@ -0,0 +1,13 @@
+import type { VideoChapter } from '@mimik/core/export/video-export';
+
+export interface StepSegment {
+ weight: number;
+ played: number;
+}
+
+export function stepSegments(chapters: VideoChapter[], time: number): StepSegment[] {
+ return chapters.map((chapter) => {
+ const length = Math.max(chapter.end - chapter.start, 0.001);
+ return { weight: length, played: Math.min(Math.max((time - chapter.start) / length, 0), 1) };
+ });
+}
diff --git a/packages/ui/src/global.css b/packages/ui/src/global.css
index 6214aae..d73b016 100644
--- a/packages/ui/src/global.css
+++ b/packages/ui/src/global.css
@@ -89,8 +89,37 @@ input[type="checkbox"]:not(:disabled) {
transform-origin: center;
}
+@keyframes wave {
+ 0%, 100% { opacity: 0.15; }
+ 50% { opacity: 1; }
+}
+
+@utility animate-wave {
+ animation: wave 1.2s ease-in-out infinite;
+}
+
+@keyframes reel {
+ from { transform: translateX(0); }
+ to { transform: translateX(-52px); }
+}
+
+@utility animate-reel {
+ animation: reel 0.9s linear infinite;
+}
+
+@keyframes rise {
+ from { opacity: 0; transform: translateY(6px); }
+}
+
+@utility animate-rise {
+ animation: rise 0.5s ease both;
+}
+
@media (prefers-reduced-motion: reduce) {
- .animate-talk {
+ .animate-talk,
+ .animate-wave,
+ .animate-reel,
+ .animate-rise {
animation: none;
}
}
diff --git a/src/locales/de.yml b/src/locales/de.yml
index 3219696..4f8f576 100644
--- a/src/locales/de.yml
+++ b/src/locales/de.yml
@@ -407,6 +407,7 @@ exportPreview:
voiceoverNoKeySkip: "Das Video ist stumm. Füge in den Einstellungen einen Voiceover-API-Schlüssel hinzu."
voiceoverNothingToSay: "Das Video ist stumm. Diese Anleitung hat keinen Text zum Vorlesen."
narrating: "Schritt $1 von $2 wird vertont"
+ preparingVoiceover: "Voiceover wird vorbereitet"
stepDescriptions: "Schritttexte"
stepDescriptionsHint: "Den Schritttext in jedes Videobild einzeichnen"
resolution: "Videoqualität"
@@ -720,3 +721,10 @@ transcript:
download: Herunterladen
delete: Transkript löschen
confirmDelete: "Dieses Transkript löschen? Das lässt sich nicht rückgängig machen."
+
+stepKind:
+ click: "Klick"
+ type: "Eingabe"
+ key: "Taste"
+ navigate: "Seite"
+ note: "Notiz"
diff --git a/src/locales/en.yml b/src/locales/en.yml
index c335f56..e0c89db 100644
--- a/src/locales/en.yml
+++ b/src/locales/en.yml
@@ -476,6 +476,7 @@ exportPreview:
voiceoverNoKeySkip: "The video is silent. Add a voice-over API key in Settings."
voiceoverNothingToSay: "The video is silent. This guide has no text to read aloud."
narrating: "Narrating step $1 of $2"
+ preparingVoiceover: "Preparing the voice-over"
stepDescriptions: "Step captions"
stepDescriptionsHint: "Draw the step text onto each video frame"
resolution: "Video quality"
@@ -719,3 +720,10 @@ transcript:
download: Download
delete: Delete transcript
confirmDelete: "Delete this transcript? This can't be undone."
+
+stepKind:
+ click: "Click"
+ type: "Type"
+ key: "Key"
+ navigate: "Page"
+ note: "Note"
diff --git a/src/locales/es.yml b/src/locales/es.yml
index 772c419..d8739be 100644
--- a/src/locales/es.yml
+++ b/src/locales/es.yml
@@ -476,6 +476,7 @@ exportPreview:
voiceoverNoKeySkip: "El vídeo no tiene sonido. Añade una clave de API de voz en off en Ajustes."
voiceoverNothingToSay: "El vídeo no tiene sonido. Esta guía no tiene texto que leer en voz alta."
narrating: "Narrando el paso $1 de $2"
+ preparingVoiceover: "Preparando la voz en off"
stepDescriptions: "Textos de los pasos"
stepDescriptionsHint: "Dibuja el texto del paso en cada fotograma del vídeo"
resolution: "Calidad de vídeo"
@@ -719,3 +720,10 @@ transcript:
download: Descargar
delete: Eliminar transcripción
confirmDelete: "¿Eliminar esta transcripción? No se puede deshacer."
+
+stepKind:
+ click: "Clic"
+ type: "Escribir"
+ key: "Tecla"
+ navigate: "Página"
+ note: "Nota"
diff --git a/src/locales/fr.yml b/src/locales/fr.yml
index 644fc03..498735a 100644
--- a/src/locales/fr.yml
+++ b/src/locales/fr.yml
@@ -476,6 +476,7 @@ exportPreview:
voiceoverNoKeySkip: "La vidéo est muette. Ajoutez une clé API de voix off dans les Paramètres."
voiceoverNothingToSay: "La vidéo est muette. Ce guide n'a aucun texte à lire à voix haute."
narrating: "Narration de l'étape $1 sur $2"
+ preparingVoiceover: "Préparation de la voix off"
stepDescriptions: "Légendes des étapes"
stepDescriptionsHint: "Incruster le texte de l'étape sur chaque image"
resolution: "Qualité vidéo"
@@ -719,3 +720,10 @@ transcript:
download: Télécharger
delete: Supprimer la transcription
confirmDelete: "Supprimer cette transcription ? Cette action est irréversible."
+
+stepKind:
+ click: "Clic"
+ type: "Saisie"
+ key: "Touche"
+ navigate: "Page"
+ note: "Note"
diff --git a/src/locales/pt-BR.yml b/src/locales/pt-BR.yml
index 1337f79..ee61d9c 100644
--- a/src/locales/pt-BR.yml
+++ b/src/locales/pt-BR.yml
@@ -476,6 +476,7 @@ exportPreview:
voiceoverNoKeySkip: "O vídeo está sem som. Adicione uma chave de API de narração em Ajustes."
voiceoverNothingToSay: "O vídeo está sem som. Este guia não tem texto para ler em voz alta."
narrating: "Narrando o passo $1 de $2"
+ preparingVoiceover: "Preparando a narração"
stepDescriptions: "Textos dos passos"
stepDescriptionsHint: "Desenhar o texto do passo em cada quadro"
resolution: "Qualidade do vídeo"
@@ -719,3 +720,10 @@ transcript:
download: Baixar
delete: "Excluir transcrição"
confirmDelete: "Excluir esta transcrição? Não é possível desfazer."
+
+stepKind:
+ click: "Clique"
+ type: "Digitar"
+ key: "Tecla"
+ navigate: "Página"
+ note: "Nota"
diff --git a/src/locales/zh-CN.yml b/src/locales/zh-CN.yml
index b94339a..9b86928 100644
--- a/src/locales/zh-CN.yml
+++ b/src/locales/zh-CN.yml
@@ -476,6 +476,7 @@ exportPreview:
voiceoverNoKeySkip: "该视频无声。请在设置中添加配音 API 密钥。"
voiceoverNothingToSay: "该视频无声。该指南没有可朗读的文本。"
narrating: "正在为第 $1 步配音,共 $2 步"
+ preparingVoiceover: "正在准备配音"
stepDescriptions: "步骤字幕"
stepDescriptionsHint: "将步骤文字绘制到每一帧视频中"
resolution: "视频质量"
@@ -719,3 +720,10 @@ transcript:
download: 下载
delete: "删除转写文本"
confirmDelete: "删除这份转写文本?此操作无法撤销。"
+
+stepKind:
+ click: "点击"
+ type: "输入"
+ key: "按键"
+ navigate: "页面"
+ note: "备注"
diff --git a/src/ui/fullview/__tests__/ExportPreviewModal.test.tsx b/src/ui/fullview/__tests__/ExportPreviewModal.test.tsx
index eb3dcc0..41008ed 100644
--- a/src/ui/fullview/__tests__/ExportPreviewModal.test.tsx
+++ b/src/ui/fullview/__tests__/ExportPreviewModal.test.tsx
@@ -203,8 +203,8 @@ describe('ExportPreviewModal video progress', () => {
onVoiceProgress: (a: number, b: number) => void;
onMuxProgress: (a: number, b: number) => void;
};
- const percent = () => screen.getByText(/^\d+%$/).textContent;
- const label = () => screen.getByText(/^exportPreview\.(narrating|encodingVideo)/).textContent;
+ const percent = () => `${screen.getByRole('progressbar').getAttribute('aria-valuenow')}%`;
+ const label = () => screen.getByText(/^exportPreview\.(narrating|preparingVoiceover|encodingVideo)/).textContent;
beforeEach(() => {
vi.clearAllMocks();
@@ -225,6 +225,15 @@ describe('ExportPreviewModal video progress', () => {
await waitFor(() => expect(exportGuideAsVideo.mock.calls.at(-1)?.[3].voiceover).toBe(true));
}
+ it('starts on the voice-over rather than encoding before the first clip is asked for', async () => {
+ await openNarratedVideo();
+
+ expect(label()).toBe('exportPreview.preparingVoiceover');
+
+ act(() => hooks().onVoiceProgress(3, 3));
+ expect(label()).toContain('exportPreview.narrating');
+ });
+
it('moves the bar while clips are synthesised instead of sitting at zero', async () => {
await openNarratedVideo();