mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-09-01 19:42:03 +00:00
feat(studio): header logo, playbar cleanup, and I/O work-area markers (#811)
* feat(studio): header logo, playbar cleanup, and I/O work-area markers
- Add Hyperframes icon mark to the studio header (left of project name)
- Remove m:ss toggle button — click the timecode directly to switch modes
- Remove frame jump input from controls bar — moved into ⌨ shortcuts panel
- Replace Loop text button with a repeat icon
- Collapse J/K/L shortcut badges into a single ⌨ icon that opens a panel
- Shortcuts panel: Jump to frame, Work area I/O display, shortcuts reference
- Implement I/O work-area markers (closes #807):
- I / Shift+I: set / clear in-point at playhead
- O / Shift+O: set / clear out-point at playhead
- A: jump to in-point (or start); E: jump to out-point (or end)
- Loop respects in/out boundaries for both forward and backward playback
- Teal work-area band + tick markers rendered on the seek bar
* fix(studio): guard against inverted in/out work-area points in loop ticks
If the user sets out-point before in-point (outPoint < inPoint), rawLoopStart
>= rawLoopEnd caused the loop guard to fire immediately on every tick, creating
a tight infinite seek loop. Both the forward RAF tick and the reverse RAF tick
now fall back to the full composition range when the work area is invalid.
* fix(studio): address work-area edge cases from review
- setInPoint/setOutPoint now cross-clear the opposite marker when setting one
would produce an inverted range (in >= out), preventing the invalid state
rather than correcting it at tick time
- Forward tick no longer gates on !adapter.isPlaying() — outPoint crossing
fires even while the adapter is running; explicitly pauses on the non-loop
path so playback stops at out-point rather than sailing to dur
- play() end-of-stream reset seeks to inPoint (if set) instead of hardcoded 0
* feat(studio): use full Hyperframes wordmark logo in header
Replace the standalone icon mark with the complete logo from logo-dark.svg
(icon mark + Hyperframes wordmark), with all black text fills inverted to
white for the dark header background. Project name is shown next to the logo
separated by a middot.
* Revert "feat(studio): use full Hyperframes wordmark logo in header"
This reverts commit a2815fc7d0.
* feat(studio): show full HeyGen/Hyperframes logo in header
Replace the standalone chevron icon with the complete logo from logo-dark.svg:
heygen label + gradient mark + hyperframes wordmark, all white fills on dark
background. Project name follows after a middot separator.
* fix(studio): use | instead of · as logo/project separator
This commit is contained in:
Miguel Ángel
@@ -1,2 +1,3 @@
|
||||
packages/studio/src/player/hooks/useTimelinePlayer.ts
|
||||
packages/studio/src/hooks/useManifestPersistence.ts
|
||||
packages/studio/src/player/components/PlayerControls.tsx
|
||||
|
||||
@@ -18,6 +18,127 @@ export interface StudioHeaderProps {
|
||||
inspectorPanelActive: boolean;
|
||||
}
|
||||
|
||||
function HyperframesLogo() {
|
||||
// Full logo from logo-dark.svg (263×79): heygen label + gradient mark + hyperframes wordmark.
|
||||
// All fill="black" paths inverted to white for the dark header.
|
||||
const height = 28;
|
||||
const width = Math.round(height * (263 / 79));
|
||||
return (
|
||||
<svg
|
||||
width={width}
|
||||
height={height}
|
||||
viewBox="0 0 263 79"
|
||||
fill="none"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
aria-label="Hyperframes"
|
||||
>
|
||||
<defs>
|
||||
<linearGradient
|
||||
id="hf-g0"
|
||||
x1="225.869"
|
||||
y1="0"
|
||||
x2="222.845"
|
||||
y2="37.482"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
>
|
||||
<stop stopColor="#06E3FA" />
|
||||
<stop offset="1" stopColor="#4FDB5E" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="hf-g1"
|
||||
x1="230.87"
|
||||
y1="39"
|
||||
x2="244.661"
|
||||
y2="6.303"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
>
|
||||
<stop stopColor="#06E3FA" />
|
||||
<stop offset="1" stopColor="#4FDB5E" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
{/* heygen label */}
|
||||
<path
|
||||
d="M0 16.6738H4.96V23.3838H11.53V16.6738H16.49V35.4538H11.53V27.6738H4.96V35.4538H0V16.6738Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M17.8899 28.0137C17.8899 23.4237 21.2399 20.0237 25.7999 20.0237C30.0099 20.0237 32.9399 23.0837 32.9399 27.5637C32.9399 28.2037 32.8599 28.8237 32.8299 29.3337H22.6099C23.0399 31.1337 24.6199 32.1237 27.1399 32.1237C28.7199 32.1237 30.2199 31.7237 31.2999 31.0237V34.6737C30.1699 35.3937 28.2999 35.8537 26.3599 35.8537C21.2599 35.8537 17.8799 32.6037 17.8799 28.0237L17.8899 28.0137ZM28.5699 26.1937C28.4899 24.5337 27.3899 23.5637 25.7499 23.5637C24.1099 23.5637 22.9599 24.5337 22.6099 26.1937H28.5699Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M37.85 33.8638L32 20.4238H37.29L40.46 28.1538L43.6 20.4238H48.48L40.33 39.5738H35.26L37.86 33.8638H37.85Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M48.1797 26.1138C48.1797 20.4238 52.7097 16.2438 58.9397 16.2438C61.2997 16.2438 63.5297 16.8038 64.8197 17.7238V21.9338C63.5597 20.9138 61.6797 20.2938 59.7497 20.2938C55.7797 20.2938 53.2597 22.6238 53.2597 26.1438C53.2597 29.6638 55.5697 31.8838 58.8897 31.8838C59.6397 31.8838 60.4997 31.7538 61.1997 31.5038V27.8838H57.4697V24.2338H65.5197V33.7038C63.6697 35.0938 61.1997 35.8738 58.5997 35.8738C52.5397 35.8738 48.1897 31.7438 48.1897 26.1138H48.1797Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M66.6604 28.0137C66.6604 23.4237 70.0104 20.0237 74.5704 20.0237C78.7804 20.0237 81.7104 23.0837 81.7104 27.5637C81.7104 28.2037 81.6304 28.8237 81.6004 29.3337H71.3804C71.8104 31.1337 73.3904 32.1237 75.9104 32.1237C77.4904 32.1237 78.9904 31.7237 80.0704 31.0237V34.6737C78.9404 35.3937 77.0704 35.8537 75.1304 35.8537C70.0304 35.8537 66.6504 32.6037 66.6504 28.0237L66.6604 28.0137ZM77.3404 26.1937C77.2604 24.5337 76.1604 23.5637 74.5204 23.5637C72.8804 23.5637 71.7304 24.5337 71.3804 26.1937H77.3404Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M82.9688 20.4238H87.8488V22.4138C88.7588 20.9638 90.3488 20.1038 92.3288 20.1038C95.4988 20.1038 97.3988 22.3338 97.3988 25.8138V35.4438H92.5188V26.8638C92.5188 25.0438 91.8188 24.1838 90.4788 24.1838C88.9488 24.1838 87.8488 25.3638 87.8488 27.2638V35.4438H82.9688V20.4238Z"
|
||||
fill="white"
|
||||
/>
|
||||
{/* gradient icon mark */}
|
||||
<path
|
||||
d="M195.219 26.1937L213.529 38.9937C216.009 40.7237 220.239 38.7637 221.009 35.5337L228.419 4.33374C229.189 1.10374 225.879 -0.856262 222.589 0.873738L198.199 13.6737C192.649 16.5837 191.059 23.2837 195.219 26.1937Z"
|
||||
fill="url(#hf-g0)"
|
||||
/>
|
||||
<path
|
||||
d="M256.97 25.9638L232.58 38.7638C229.28 40.4938 225.98 38.5338 226.75 35.3038L234.16 4.10376C234.93 0.873757 239.16 -1.08624 241.64 0.643757L259.95 13.4438C264.12 16.3538 262.52 23.0538 256.97 25.9638Z"
|
||||
fill="url(#hf-g1)"
|
||||
/>
|
||||
{/* hyperframes wordmark */}
|
||||
<path
|
||||
d="M0 71.9996V42.7256H7.7367V53.1806H17.9826V42.7256H25.7193V71.9996H17.9826V59.8718H7.7367V71.9996H0Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M31.9606 78.4405L36.0171 69.5329L26.9004 48.5811H35.1389L40.0737 60.6252L44.9666 48.5811H52.5779L39.8646 78.4405H31.9606Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M53.3711 78.4404V48.5809H60.9823V52.052C62.446 49.501 65.0807 48.0791 68.3008 48.0791C74.3647 48.0791 78.9649 53.3066 78.9649 60.2487C78.9649 67.2745 74.3229 72.4602 68.259 72.4602C65.0807 72.4602 62.446 71.1637 60.9823 68.78V78.4404H53.3711ZM66.1262 66.1872C69.2627 66.1872 71.3119 63.7616 71.3119 60.2905C71.3119 56.8195 69.2627 54.4357 66.1262 54.4357C62.7388 54.4357 60.9823 57.2795 60.9823 59.7051V60.9178C60.9823 63.3434 62.7388 66.1872 66.1262 66.1872Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M93.4397 72.6269C85.4939 72.6269 80.2246 67.5667 80.2246 60.4155C80.2246 53.2643 85.4521 47.9531 92.5615 47.9531C99.1273 47.9531 103.686 52.7206 103.686 59.7045C103.686 60.7082 103.56 61.6701 103.518 62.4647H87.5849C88.2541 65.2666 90.7214 66.8139 94.6525 66.8139C97.1199 66.8139 99.4618 66.1866 101.135 65.0993V70.7868C99.3782 71.916 96.4508 72.6269 93.4397 72.6269ZM87.5849 57.5717H96.869C96.7435 54.9789 95.0289 53.4734 92.4779 53.4734C89.9687 53.4734 88.1286 54.9789 87.5849 57.5717Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M105.645 72V48.5808H113.214V52.9719C114.218 50.0445 116.183 48.2881 118.692 48.2881C119.361 48.2881 119.989 48.4135 120.407 48.6645V55.8993C119.822 55.5648 119.111 55.4393 118.274 55.4393C115.138 55.4393 113.256 57.6558 113.256 61.2941V72H105.645Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M122.643 71.9996V42.7256H139.371V49.124H130.379V54.477H138.911V60.5827H130.379V71.9996H122.643Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M141.258 72V48.5808H148.827V52.9719C149.831 50.0445 151.796 48.2881 154.306 48.2881C154.975 48.2881 155.602 48.4135 156.02 48.6645V55.8993C155.435 55.5648 154.724 55.4393 153.887 55.4393C150.751 55.4393 148.869 57.6558 148.869 61.2941V72H141.258Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M167.26 72.4602C161.154 72.4602 156.596 67.2745 156.596 60.3324C156.596 53.3066 161.196 48.0791 167.302 48.0791C170.438 48.0791 173.031 49.4173 174.536 51.8429V48.5809H182.148V72.0001H174.536V68.4873C173.031 71.0801 170.438 72.4602 167.26 72.4602ZM169.393 66.1872C172.78 66.1872 174.536 63.3434 174.536 60.876V59.6632C174.536 57.2377 172.78 54.4357 169.393 54.4357C166.298 54.4357 164.207 56.7777 164.207 60.2905C164.207 63.7616 166.298 66.1872 169.393 66.1872Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M184.998 72.0001V48.5809H192.609V51.6756C193.989 49.4173 196.373 48.0791 199.426 48.0791C202.521 48.0791 204.779 49.5428 206.075 52.052C207.497 49.5846 210.132 48.0791 213.352 48.0791C218.245 48.0791 221.214 51.592 221.214 57.0286V72.0001H213.603V58.5341C213.603 55.774 212.557 54.4357 210.634 54.4357C208.459 54.4357 206.912 56.234 206.912 59.0778V72.0001H199.3V58.5341C199.3 55.774 198.255 54.4357 196.373 54.4357C194.157 54.4357 192.609 56.234 192.609 59.0778V72.0001H184.998Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M236.338 72.6269C228.392 72.6269 223.123 67.5667 223.123 60.4155C223.123 53.2643 228.351 47.9531 235.46 47.9531C242.026 47.9531 246.584 52.7206 246.584 59.7045C246.584 60.7082 246.459 61.6701 246.417 62.4647H230.483C231.152 65.2666 233.62 66.8139 237.551 66.8139C240.018 66.8139 242.36 66.1866 244.033 65.0993V70.7868C242.277 71.916 239.349 72.6269 236.338 72.6269ZM230.483 57.5717H239.767C239.642 54.9789 237.927 53.4734 235.376 53.4734C232.867 53.4734 231.027 54.9789 230.483 57.5717Z"
|
||||
fill="white"
|
||||
/>
|
||||
<path
|
||||
d="M252.115 72.502C250.192 72.502 248.268 72.0838 246.93 71.3728V65.6853C247.808 66.3126 248.937 66.689 250.066 66.689C251.739 66.689 252.784 65.8526 252.784 64.5562C252.784 63.8452 252.492 63.0925 251.655 62.0888L249.899 59.956C248.728 58.4923 248.226 56.9031 248.226 55.2721C248.226 51.0065 251.864 48.0791 256.883 48.0791C258.723 48.0791 260.438 48.4555 261.65 49.0828V54.7703C260.898 54.2266 259.768 53.8503 258.723 53.8503C257.092 53.8503 256.046 54.6867 256.046 55.8994C256.046 56.6522 256.423 57.405 257.259 58.4086L258.974 60.4996C260.187 62.047 260.73 63.5943 260.73 65.2671C260.73 69.5746 257.05 72.502 252.115 72.502Z"
|
||||
fill="white"
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
|
||||
export function StudioHeader({
|
||||
captureFrameHref,
|
||||
captureFrameFilename,
|
||||
@@ -32,9 +153,13 @@ export function StudioHeader({
|
||||
|
||||
return (
|
||||
<div className="flex items-center justify-between h-10 px-3 bg-neutral-900 border-b border-neutral-800 flex-shrink-0">
|
||||
{/* Left: project name */}
|
||||
<div className="flex items-center gap-2">
|
||||
<span className="text-[11px] font-medium text-neutral-400">{projectId}</span>
|
||||
{/* Left: logo + project name */}
|
||||
<div className="flex items-center gap-3">
|
||||
<HyperframesLogo />
|
||||
<span className="text-neutral-700 select-none" aria-hidden="true">
|
||||
|
|
||||
</span>
|
||||
<span className="text-[11px] font-medium text-neutral-300">{projectId}</span>
|
||||
</div>
|
||||
{/* Right: toolbar buttons */}
|
||||
<div className="flex items-center gap-1.5">
|
||||
|
||||
@@ -6,11 +6,29 @@ import { usePlayerStore, liveTime } from "../store/playerStore";
|
||||
const SPEED_OPTIONS = [0.25, 0.5, 1, 1.5, 2] as const;
|
||||
const SEEK_EDGE_SNAP_PX = 8;
|
||||
type TimeDisplayMode = "time" | "frame";
|
||||
const SHORTCUT_HINTS = [
|
||||
{ key: "J", label: "Play backward" },
|
||||
{ key: "K", label: "Stop playback" },
|
||||
{ key: "L", label: "Play forward" },
|
||||
{ key: "←/→", label: "Step one frame backward or forward" },
|
||||
const SHORTCUT_SECTIONS = [
|
||||
{
|
||||
title: "Playback",
|
||||
hints: [
|
||||
{ key: "Space", label: "Play / Pause" },
|
||||
{ key: "J", label: "Play backward" },
|
||||
{ key: "K", label: "Stop" },
|
||||
{ key: "L", label: "Play forward" },
|
||||
{ key: "←/→", label: "Step 1 frame" },
|
||||
{ key: "⇧←/⇧→", label: "Step 10 frames" },
|
||||
],
|
||||
},
|
||||
{
|
||||
title: "Work area",
|
||||
hints: [
|
||||
{ key: "I", label: "Set in-point" },
|
||||
{ key: "⇧I", label: "Clear in-point" },
|
||||
{ key: "O", label: "Set out-point" },
|
||||
{ key: "⇧O", label: "Clear out-point" },
|
||||
{ key: "A", label: "Jump to in-point" },
|
||||
{ key: "E", label: "Jump to out-point" },
|
||||
],
|
||||
},
|
||||
] as const;
|
||||
|
||||
export function resolveSeekPercent(clientX: number, rectLeft: number, rectWidth: number): number {
|
||||
@@ -42,7 +60,12 @@ export const PlayerControls = memo(function PlayerControls({
|
||||
const loopEnabled = usePlayerStore((s) => s.loopEnabled);
|
||||
const setPlaybackRate = usePlayerStore.getState().setPlaybackRate;
|
||||
const setLoopEnabled = usePlayerStore.getState().setLoopEnabled;
|
||||
const inPoint = usePlayerStore((s) => s.inPoint);
|
||||
const outPoint = usePlayerStore((s) => s.outPoint);
|
||||
const setInPoint = usePlayerStore.getState().setInPoint;
|
||||
const setOutPoint = usePlayerStore.getState().setOutPoint;
|
||||
const [showSpeedMenu, setShowSpeedMenu] = useState(false);
|
||||
const [showShortcuts, setShowShortcuts] = useState(false);
|
||||
const [timeDisplayMode, setTimeDisplayMode] = useState<TimeDisplayMode>("time");
|
||||
const [jumpFrame, setJumpFrame] = useState("");
|
||||
|
||||
@@ -52,6 +75,7 @@ export const PlayerControls = memo(function PlayerControls({
|
||||
const seekBarRef = useRef<HTMLDivElement>(null);
|
||||
const sliderRef = useRef<HTMLDivElement>(null);
|
||||
const speedMenuContainerRef = useRef<HTMLDivElement>(null);
|
||||
const shortcutsPanelRef = useRef<HTMLDivElement>(null);
|
||||
const isDraggingRef = useRef(false);
|
||||
const currentTimeRef = useRef(0);
|
||||
const timeDisplayModeRef = useRef(timeDisplayMode);
|
||||
@@ -116,6 +140,19 @@ export const PlayerControls = memo(function PlayerControls({
|
||||
};
|
||||
}, [showSpeedMenu]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!showShortcuts) return;
|
||||
const handleMouseDown = (e: MouseEvent) => {
|
||||
if (shortcutsPanelRef.current && !shortcutsPanelRef.current.contains(e.target as Node)) {
|
||||
setShowShortcuts(false);
|
||||
}
|
||||
};
|
||||
document.addEventListener("mousedown", handleMouseDown);
|
||||
return () => {
|
||||
document.removeEventListener("mousedown", handleMouseDown);
|
||||
};
|
||||
}, [showShortcuts]);
|
||||
|
||||
const seekFromClientX = useCallback(
|
||||
(clientX: number) => {
|
||||
if (disabled) return;
|
||||
@@ -278,10 +315,14 @@ export const PlayerControls = memo(function PlayerControls({
|
||||
)}
|
||||
</button>
|
||||
|
||||
{/* Time display */}
|
||||
<span
|
||||
className="font-mono text-[11px] tabular-nums flex-shrink-0 w-[118px]"
|
||||
style={{ color: "#A1A1AA" }}
|
||||
{/* Time display — click to toggle time/frame mode */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setTimeDisplayMode((m) => (m === "time" ? "frame" : "time"))}
|
||||
disabled={disabled}
|
||||
title={timeDisplayMode === "time" ? "Switch to frame display" : "Switch to time display"}
|
||||
className="font-mono text-[11px] tabular-nums flex-shrink-0 w-[118px] text-left transition-colors disabled:pointer-events-none hover:opacity-80"
|
||||
style={{ color: "#A1A1AA", cursor: "pointer" }}
|
||||
>
|
||||
<span ref={timeDisplayRef}>{formatTime(0)}</span>
|
||||
{timeDisplayMode === "time" ? (
|
||||
@@ -290,7 +331,7 @@ export const PlayerControls = memo(function PlayerControls({
|
||||
<span style={{ color: "#52525B" }}>{formatTime(duration)}</span>
|
||||
</>
|
||||
) : null}
|
||||
</span>
|
||||
</button>
|
||||
|
||||
{/* Seek bar — teal progress fill */}
|
||||
<div
|
||||
@@ -320,16 +361,57 @@ export const PlayerControls = memo(function PlayerControls({
|
||||
className="w-full rounded-full relative"
|
||||
style={{ background: "rgba(255,255,255,0.15)", height: "3px" }}
|
||||
>
|
||||
{/* Work-area band between in/out points */}
|
||||
{(inPoint !== null || outPoint !== null) && duration > 0 && (
|
||||
<div
|
||||
className="absolute top-0 bottom-0 pointer-events-none"
|
||||
style={{
|
||||
left: `${inPoint !== null ? Math.min(100, (inPoint / duration) * 100) : 0}%`,
|
||||
right: `${outPoint !== null ? 100 - Math.min(100, (outPoint / duration) * 100) : 0}%`,
|
||||
background: "rgba(60,230,172,0.15)",
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{/* Progress fill — width is controlled imperatively via ref to avoid React re-render resets */}
|
||||
<div
|
||||
ref={progressFillRef}
|
||||
className="absolute top-0 bottom-0 left-0 z-[1] rounded-full"
|
||||
style={{ background: "linear-gradient(90deg, var(--hf-accent, #3CE6AC), #2BBFA0)" }}
|
||||
/>
|
||||
{/* In-point marker */}
|
||||
{inPoint !== null && duration > 0 && (
|
||||
<div
|
||||
className="absolute z-[3] pointer-events-none"
|
||||
style={{
|
||||
left: `${Math.min(100, (inPoint / duration) * 100)}%`,
|
||||
top: "50%",
|
||||
transform: "translate(-50%, -50%)",
|
||||
width: "2px",
|
||||
height: "10px",
|
||||
background: "#3CE6AC",
|
||||
borderRadius: "1px",
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{/* Out-point marker */}
|
||||
{outPoint !== null && duration > 0 && (
|
||||
<div
|
||||
className="absolute z-[3] pointer-events-none"
|
||||
style={{
|
||||
left: `${Math.min(100, (outPoint / duration) * 100)}%`,
|
||||
top: "50%",
|
||||
transform: "translate(-50%, -50%)",
|
||||
width: "2px",
|
||||
height: "10px",
|
||||
background: "#3CE6AC",
|
||||
borderRadius: "1px",
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{/* Playhead thumb — left is controlled imperatively via ref */}
|
||||
<div
|
||||
ref={progressThumbRef}
|
||||
className="absolute top-1/2 z-[2] w-3 h-3 rounded-full -translate-y-1/2 -translate-x-1/2 transition-transform group-hover:scale-125"
|
||||
className="absolute top-1/2 z-[4] w-3 h-3 rounded-full -translate-y-1/2 -translate-x-1/2 transition-transform group-hover:scale-125"
|
||||
style={{
|
||||
background: "var(--hf-accent, #3CE6AC)",
|
||||
boxShadow: "0 0 6px rgba(60,230,172,0.4), 0 1px 4px rgba(0,0,0,0.4)",
|
||||
@@ -385,7 +467,7 @@ export const PlayerControls = memo(function PlayerControls({
|
||||
type="button"
|
||||
onClick={() => setLoopEnabled(!loopEnabled)}
|
||||
disabled={disabled}
|
||||
className={`h-7 w-14 rounded-md border px-2 text-[10px] font-medium transition-colors ${
|
||||
className={`h-7 w-7 flex items-center justify-center rounded-md border transition-colors ${
|
||||
loopEnabled
|
||||
? "text-studio-accent bg-studio-accent/10 border-studio-accent/30"
|
||||
: "border-neutral-700 text-neutral-400 hover:border-neutral-500 hover:bg-neutral-800"
|
||||
@@ -394,53 +476,201 @@ export const PlayerControls = memo(function PlayerControls({
|
||||
aria-label={loopEnabled ? "Disable loop playback" : "Enable loop playback"}
|
||||
aria-pressed={loopEnabled}
|
||||
>
|
||||
Loop
|
||||
<svg
|
||||
width="13"
|
||||
height="13"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="2"
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path d="M17 2l4 4-4 4" />
|
||||
<path d="M3 11V9a4 4 0 0 1 4-4h14" />
|
||||
<path d="M7 22l-4-4 4-4" />
|
||||
<path d="M21 13v2a4 4 0 0 1-4 4H3" />
|
||||
</svg>
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setTimeDisplayMode((mode) => (mode === "time" ? "frame" : "time"))}
|
||||
disabled={disabled}
|
||||
className="h-7 w-14 rounded-md border border-neutral-700 px-2 text-[10px] font-mono text-neutral-300 transition-colors hover:border-neutral-500 hover:bg-neutral-800"
|
||||
title="Toggle time/frame display"
|
||||
aria-label="Toggle time and frame display"
|
||||
>
|
||||
{timeDisplayMode === "time" ? "m:ss" : "frames"}
|
||||
</button>
|
||||
|
||||
<form
|
||||
onSubmit={handleJumpSubmit}
|
||||
className="hidden sm:flex flex-shrink-0 w-[58px] items-center"
|
||||
>
|
||||
<input
|
||||
value={jumpFrame}
|
||||
onChange={(e) => setJumpFrame(e.target.value)}
|
||||
disabled={disabled}
|
||||
inputMode="numeric"
|
||||
pattern="[0-9]*"
|
||||
aria-label="Jump to frame"
|
||||
placeholder="frame"
|
||||
className="h-7 w-[58px] rounded-md border border-neutral-700 bg-neutral-900 px-2 text-[10px] font-mono tabular-nums text-neutral-200 outline-none transition-colors placeholder:text-neutral-600 focus:border-studio-accent/60"
|
||||
onKeyDown={handleJumpKeyDown}
|
||||
onBlur={commitJumpFrame}
|
||||
/>
|
||||
</form>
|
||||
|
||||
<div
|
||||
className="hidden lg:flex items-center gap-1 text-[9px] font-mono text-neutral-500"
|
||||
aria-label="Playback shortcuts: J backward, K stop, L forward, arrows step one frame"
|
||||
>
|
||||
{SHORTCUT_HINTS.map((shortcut) => (
|
||||
<span
|
||||
key={shortcut.key}
|
||||
className="group relative rounded border border-neutral-800 px-1 py-0.5"
|
||||
{/* Keyboard shortcuts + frame jump + work area — click to open panel */}
|
||||
<div ref={shortcutsPanelRef} className="relative flex-shrink-0">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setShowShortcuts((v) => !v)}
|
||||
className={`w-6 h-6 flex items-center justify-center rounded border transition-colors ${
|
||||
showShortcuts
|
||||
? "border-neutral-600 text-neutral-200 bg-neutral-800"
|
||||
: "border-neutral-800 text-neutral-600 hover:text-neutral-300 hover:border-neutral-600"
|
||||
}`}
|
||||
aria-label="Shortcuts and tools"
|
||||
aria-expanded={showShortcuts}
|
||||
>
|
||||
<svg
|
||||
width="11"
|
||||
height="11"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="1.75"
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
aria-hidden="true"
|
||||
>
|
||||
{shortcut.key}
|
||||
<span className="pointer-events-none absolute bottom-full left-1/2 z-50 mb-1.5 hidden -translate-x-1/2 whitespace-nowrap rounded-md border border-neutral-700 bg-neutral-950 px-2 py-1 font-sans text-[10px] text-neutral-200 shadow-lg group-hover:block">
|
||||
{shortcut.label}
|
||||
</span>
|
||||
</span>
|
||||
))}
|
||||
<rect x="2" y="4" width="20" height="16" rx="2" />
|
||||
<path d="M6 8h.01M10 8h.01M14 8h.01M18 8h.01M6 12h.01M10 12h.01M14 12h.01M18 12h.01M8 16h8" />
|
||||
</svg>
|
||||
</button>
|
||||
{showShortcuts && (
|
||||
<div
|
||||
className="absolute bottom-full right-0 mb-2 z-50 rounded-lg shadow-xl min-w-[220px] overflow-y-auto"
|
||||
style={{
|
||||
background: "#161618",
|
||||
border: "1px solid rgba(255,255,255,0.08)",
|
||||
maxHeight: "min(280px, calc(100vh - 80px))",
|
||||
}}
|
||||
>
|
||||
{/* Frame jump */}
|
||||
<div className="px-3 pt-3 pb-2.5">
|
||||
<p className="text-[9px] font-medium text-neutral-500 uppercase tracking-wider mb-1.5">
|
||||
Jump to frame
|
||||
</p>
|
||||
<form onSubmit={handleJumpSubmit} className="flex items-center gap-1.5">
|
||||
<input
|
||||
value={jumpFrame}
|
||||
onChange={(e) => setJumpFrame(e.target.value)}
|
||||
disabled={disabled}
|
||||
inputMode="numeric"
|
||||
pattern="[0-9]*"
|
||||
aria-label="Jump to frame"
|
||||
placeholder="frame number"
|
||||
className="h-6 flex-1 rounded border border-neutral-700 bg-neutral-900 px-2 text-[10px] font-mono tabular-nums text-neutral-200 outline-none transition-colors placeholder:text-neutral-600 focus:border-studio-accent/60"
|
||||
onKeyDown={handleJumpKeyDown}
|
||||
onBlur={commitJumpFrame}
|
||||
/>
|
||||
<button
|
||||
type="submit"
|
||||
disabled={disabled}
|
||||
className="h-6 px-2 rounded border border-neutral-700 text-[10px] text-neutral-300 transition-colors hover:border-neutral-500 hover:bg-neutral-800 disabled:opacity-40"
|
||||
>
|
||||
Go
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
<div style={{ borderTop: "1px solid rgba(255,255,255,0.06)" }} />
|
||||
{/* Work area */}
|
||||
<div className="px-3 pt-2.5 pb-2">
|
||||
<p className="text-[9px] font-medium text-neutral-500 uppercase tracking-wider mb-1.5">
|
||||
Work area
|
||||
</p>
|
||||
<div className="flex flex-col gap-1">
|
||||
<div className="flex items-center justify-between gap-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<span
|
||||
className="font-mono text-[10px] rounded border border-neutral-700 px-1.5 py-0.5 text-neutral-300 min-w-[20px] text-center"
|
||||
style={{ background: "rgba(255,255,255,0.05)" }}
|
||||
>
|
||||
I
|
||||
</span>
|
||||
<span className="text-[10px] text-neutral-400">In-point</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
{inPoint !== null ? (
|
||||
<>
|
||||
<span className="font-mono text-[10px] text-neutral-300">
|
||||
{formatTime(inPoint)}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setInPoint(null)}
|
||||
className="w-4 h-4 flex items-center justify-center rounded text-neutral-500 hover:text-neutral-200 transition-colors"
|
||||
aria-label="Clear in-point"
|
||||
>
|
||||
<svg
|
||||
width="8"
|
||||
height="8"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="2.5"
|
||||
>
|
||||
<path d="M18 6L6 18M6 6l12 12" />
|
||||
</svg>
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<span className="text-[10px] text-neutral-600">—</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center justify-between gap-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<span
|
||||
className="font-mono text-[10px] rounded border border-neutral-700 px-1.5 py-0.5 text-neutral-300 min-w-[20px] text-center"
|
||||
style={{ background: "rgba(255,255,255,0.05)" }}
|
||||
>
|
||||
O
|
||||
</span>
|
||||
<span className="text-[10px] text-neutral-400">Out-point</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
{outPoint !== null ? (
|
||||
<>
|
||||
<span className="font-mono text-[10px] text-neutral-300">
|
||||
{formatTime(outPoint)}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setOutPoint(null)}
|
||||
className="w-4 h-4 flex items-center justify-center rounded text-neutral-500 hover:text-neutral-200 transition-colors"
|
||||
aria-label="Clear out-point"
|
||||
>
|
||||
<svg
|
||||
width="8"
|
||||
height="8"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="2.5"
|
||||
>
|
||||
<path d="M18 6L6 18M6 6l12 12" />
|
||||
</svg>
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<span className="text-[10px] text-neutral-600">—</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style={{ borderTop: "1px solid rgba(255,255,255,0.06)" }} />
|
||||
{/* Shortcuts */}
|
||||
<div className="px-3 pt-2.5 pb-3 flex flex-col gap-3">
|
||||
{SHORTCUT_SECTIONS.map((section) => (
|
||||
<div key={section.title}>
|
||||
<p className="text-[9px] font-medium text-neutral-500 uppercase tracking-wider mb-1.5">
|
||||
{section.title}
|
||||
</p>
|
||||
<div className="flex flex-col gap-1">
|
||||
{section.hints.map((hint) => (
|
||||
<div key={hint.key} className="flex items-center gap-3">
|
||||
<span
|
||||
className="font-mono text-[10px] rounded border border-neutral-700 px-1.5 py-0.5 text-neutral-300 min-w-[36px] text-center"
|
||||
style={{ background: "rgba(255,255,255,0.05)" }}
|
||||
>
|
||||
{hint.key}
|
||||
</span>
|
||||
<span className="text-[10px] text-neutral-400">{hint.label}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -128,9 +128,33 @@ export function usePlaybackKeyboard({
|
||||
return;
|
||||
}
|
||||
shuttle("forward");
|
||||
return;
|
||||
}
|
||||
if (e.code === "KeyI") {
|
||||
e.preventDefault();
|
||||
const t = getAdapter()?.getTime() ?? usePlayerStore.getState().currentTime;
|
||||
usePlayerStore.getState().setInPoint(e.shiftKey ? null : t);
|
||||
return;
|
||||
}
|
||||
if (e.code === "KeyO") {
|
||||
e.preventDefault();
|
||||
const t = getAdapter()?.getTime() ?? usePlayerStore.getState().currentTime;
|
||||
usePlayerStore.getState().setOutPoint(e.shiftKey ? null : t);
|
||||
return;
|
||||
}
|
||||
if (e.code === "KeyA") {
|
||||
e.preventDefault();
|
||||
seek(usePlayerStore.getState().inPoint ?? 0);
|
||||
return;
|
||||
}
|
||||
if (e.code === "KeyE") {
|
||||
e.preventDefault();
|
||||
const { outPoint } = usePlayerStore.getState();
|
||||
seek(outPoint ?? getAdapter()?.getDuration() ?? usePlayerStore.getState().duration);
|
||||
return;
|
||||
}
|
||||
},
|
||||
[pause, shuttle, stepFrames, togglePlay],
|
||||
[pause, shuttle, stepFrames, togglePlay, getAdapter, seek],
|
||||
);
|
||||
|
||||
const handlePlaybackKeyUp = useCallback((e: KeyboardEvent) => {
|
||||
|
||||
@@ -185,15 +185,21 @@ export function useTimelinePlayer() {
|
||||
const time = adapter.getTime();
|
||||
const dur = adapter.getDuration();
|
||||
liveTime.notify(time); // direct DOM updates, no React re-render
|
||||
if (time >= dur && !adapter.isPlaying()) {
|
||||
const { inPoint, outPoint } = usePlayerStore.getState();
|
||||
const rawLoopEnd = outPoint !== null ? outPoint : dur;
|
||||
const rawLoopStart = inPoint !== null ? inPoint : 0;
|
||||
const loopEnd = rawLoopStart < rawLoopEnd ? rawLoopEnd : dur;
|
||||
const loopStart = rawLoopStart < rawLoopEnd ? rawLoopStart : 0;
|
||||
if (time >= loopEnd) {
|
||||
if (usePlayerStore.getState().loopEnabled && dur > 0) {
|
||||
adapter.seek(0);
|
||||
liveTime.notify(0);
|
||||
adapter.seek(loopStart);
|
||||
liveTime.notify(loopStart);
|
||||
adapter.play();
|
||||
setIsPlaying(true);
|
||||
rafRef.current = requestAnimationFrame(tick);
|
||||
return;
|
||||
}
|
||||
if (adapter.isPlaying()) adapter.pause();
|
||||
setCurrentTime(time); // sync Zustand once at end
|
||||
setIsPlaying(false);
|
||||
cancelAnimationFrame(rafRef.current);
|
||||
@@ -241,7 +247,7 @@ export function useTimelinePlayer() {
|
||||
const adapter = getAdapter();
|
||||
if (!adapter) return;
|
||||
if (adapter.getTime() >= adapter.getDuration()) {
|
||||
adapter.seek(0);
|
||||
adapter.seek(usePlayerStore.getState().inPoint ?? 0);
|
||||
}
|
||||
unmutePreviewMedia(iframeRef.current);
|
||||
applyPlaybackRate(usePlayerStore.getState().playbackRate);
|
||||
@@ -269,15 +275,20 @@ export function useTimelinePlayer() {
|
||||
const tick = (now: number) => {
|
||||
const elapsed = ((now - startedAt) / 1000) * speed;
|
||||
let nextTime = startTime - elapsed;
|
||||
if (nextTime <= 0) {
|
||||
const { inPoint, outPoint } = usePlayerStore.getState();
|
||||
const rawLoopEnd = outPoint !== null ? outPoint : duration;
|
||||
const rawLoopStart = inPoint !== null ? inPoint : 0;
|
||||
const loopEnd = rawLoopStart < rawLoopEnd ? rawLoopEnd : duration;
|
||||
const loopStart = rawLoopStart < rawLoopEnd ? rawLoopStart : 0;
|
||||
if (nextTime <= loopStart) {
|
||||
if (usePlayerStore.getState().loopEnabled && duration > 0) {
|
||||
startTime = duration;
|
||||
startTime = loopEnd;
|
||||
startedAt = now;
|
||||
nextTime = duration;
|
||||
nextTime = loopEnd;
|
||||
} else {
|
||||
adapter.seek(0);
|
||||
liveTime.notify(0);
|
||||
setCurrentTime(0);
|
||||
adapter.seek(loopStart);
|
||||
liveTime.notify(loopStart);
|
||||
setCurrentTime(loopStart);
|
||||
setIsPlaying(false);
|
||||
shuttleDirectionRef.current = null;
|
||||
reverseRafRef.current = 0;
|
||||
|
||||
@@ -43,6 +43,10 @@ interface PlayerState {
|
||||
zoomMode: ZoomMode;
|
||||
/** Timeline zoom percent relative to the fit width when in manual mode */
|
||||
manualZoomPercent: number;
|
||||
/** Work-area in-point (seconds). When set, loop starts here and A jumps here. */
|
||||
inPoint: number | null;
|
||||
/** Work-area out-point (seconds). When set, loop ends here and E jumps here. */
|
||||
outPoint: number | null;
|
||||
|
||||
setIsPlaying: (playing: boolean) => void;
|
||||
setCurrentTime: (time: number) => void;
|
||||
@@ -58,6 +62,8 @@ interface PlayerState {
|
||||
) => void;
|
||||
setZoomMode: (mode: ZoomMode) => void;
|
||||
setManualZoomPercent: (percent: number) => void;
|
||||
setInPoint: (time: number | null) => void;
|
||||
setOutPoint: (time: number | null) => void;
|
||||
reset: () => void;
|
||||
|
||||
/**
|
||||
@@ -93,6 +99,8 @@ export const usePlayerStore = create<PlayerState>((set) => ({
|
||||
loopEnabled: false,
|
||||
zoomMode: "fit",
|
||||
manualZoomPercent: 100,
|
||||
inPoint: null,
|
||||
outPoint: null,
|
||||
|
||||
requestedSeekTime: null,
|
||||
requestSeek: (time) => set({ requestedSeekTime: time }),
|
||||
@@ -105,6 +113,23 @@ export const usePlayerStore = create<PlayerState>((set) => ({
|
||||
},
|
||||
setLoopEnabled: (enabled) => set({ loopEnabled: enabled }),
|
||||
setZoomMode: (mode) => set({ zoomMode: mode }),
|
||||
setInPoint: (time) =>
|
||||
set((state) => {
|
||||
const t = time !== null && Number.isFinite(time) ? time : null;
|
||||
return {
|
||||
inPoint: t,
|
||||
outPoint:
|
||||
t !== null && state.outPoint !== null && t >= state.outPoint ? null : state.outPoint,
|
||||
};
|
||||
}),
|
||||
setOutPoint: (time) =>
|
||||
set((state) => {
|
||||
const t = time !== null && Number.isFinite(time) ? time : null;
|
||||
return {
|
||||
outPoint: t,
|
||||
inPoint: t !== null && state.inPoint !== null && t <= state.inPoint ? null : state.inPoint,
|
||||
};
|
||||
}),
|
||||
setManualZoomPercent: (percent) =>
|
||||
set({ manualZoomPercent: Math.max(10, Math.min(2000, Math.round(percent))) }),
|
||||
setCurrentTime: (time) => set({ currentTime: Number.isFinite(time) ? time : 0 }),
|
||||
@@ -129,5 +154,7 @@ export const usePlayerStore = create<PlayerState>((set) => ({
|
||||
timelineReady: false,
|
||||
elements: [],
|
||||
selectedElementId: null,
|
||||
inPoint: null,
|
||||
outPoint: null,
|
||||
}),
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user