mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-09-10 22:20:14 +00:00
feat: Persist Studio manual edits via manifest (#593)
## Summary Studio manual geometry edits now persist as a project-local manifest instead of being baked into composition source on each gesture. The manifest lives at: ```text .hyperframes/studio-manual-edits.json ``` It is the source of truth for manual drag, resize, rotation, inspector geometry edits, group moves, and selected-layer reset. ## Architecture - **Manifest-backed edits**: each edit stores a kind (`path-offset`, `box-size`, `rotation`), a source-scoped target, and the edit values. - **Source-scoped resolution**: targets include `sourceFile`, `id`, `selector`, and `selectorIndex`, so duplicate selectors in nested compositions resolve against the owning source file. - **Additive CSS layer**: move uses CSS `translate`, resize writes stable dimensions/flex sizing, and rotation uses CSS `rotate` over the authored base. - **Shared replay runtime**: Studio preview, thumbnails, frame capture, producer renders, and CLI Studio renders/thumbnails all use the same core manual-edit render script. - **Animation-safe replay**: Studio reapplies the manual layer after load, refresh, timeline seeks, player operations, playback frames, thumbnail seeks, and render seeks instead of rewriting GSAP timelines. - **History and handoff**: the manifest is a normal project file, so undo/redo and agent edits can preserve, modify, or remove manual visual edits explicitly. ## User Impact Users can move, resize, rotate, group-move, and reset supported layers from the canvas or inspector, then refresh, capture thumbnails/screenshots, play animated compositions, and render videos without manual edits drifting away from the edited state. ## Main Files - `packages/studio/src/components/editor/manualEdits.ts` - `packages/studio/src/components/editor/DomEditOverlay.tsx` - `packages/studio/src/components/editor/PropertyPanel.tsx` - `packages/studio/src/App.tsx` - `packages/core/src/studio-api/helpers/manualEditsRenderScript.ts` - `packages/studio/vite.config.ts` - `packages/cli/src/server/studioServer.ts` - `packages/core/src/compiler/htmlBundler.ts` - `packages/producer/src/services/htmlCompiler.ts` - `packages/core/src/studio-api/routes/thumbnail.ts` - `packages/producer/src/services/fileServer.ts` - `packages/producer/src/services/renderOrchestrator.ts` ## Test Plan ```bash volta run --node 22.20.0 bun run build volta run --node 22.20.0 bun run --filter @hyperframes/core test -- src/studio-api/helpers/manualEditsRenderScript.test.ts volta run --node 22.20.0 bun run --filter @hyperframes/core typecheck volta run --node 22.20.0 bun run --filter @hyperframes/studio typecheck volta run --node 22.20.0 bun run --filter @hyperframes/cli typecheck volta run --node 22.20.0 bunx oxlint <changed files> volta run --node 22.20.0 bunx oxfmt --check <changed files> git diff --check ```
This commit is contained in:
@@ -0,0 +1,337 @@
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import {
|
||||
buildEditHistoryEntry,
|
||||
createEmptyEditHistory,
|
||||
hashEditHistoryContent,
|
||||
pushEditHistoryEntry,
|
||||
redoEditHistory,
|
||||
undoEditHistory,
|
||||
type BuildEditHistoryEntryInput,
|
||||
type EditHistoryKind,
|
||||
type EditHistoryState,
|
||||
} from "../utils/editHistory";
|
||||
import {
|
||||
createIndexedDbEditHistoryStorage,
|
||||
loadEditHistoryState,
|
||||
saveEditHistoryState,
|
||||
type EditHistoryStorageAdapter,
|
||||
} from "../utils/editHistoryStorage";
|
||||
|
||||
interface RecordEditInput {
|
||||
label: string;
|
||||
kind: EditHistoryKind;
|
||||
coalesceKey?: string;
|
||||
files: BuildEditHistoryEntryInput["files"];
|
||||
}
|
||||
|
||||
interface ApplyCallbacks {
|
||||
readFile: (path: string) => Promise<string>;
|
||||
writeFile: (path: string, content: string) => Promise<void>;
|
||||
}
|
||||
|
||||
interface UsePersistentEditHistoryOptions {
|
||||
projectId: string | null;
|
||||
storage?: EditHistoryStorageAdapter;
|
||||
now?: () => number;
|
||||
}
|
||||
|
||||
interface ApplyResult {
|
||||
ok: boolean;
|
||||
reason?: "empty" | "content-mismatch";
|
||||
label?: string;
|
||||
paths?: string[];
|
||||
}
|
||||
|
||||
interface PersistentEditHistoryStoreOptions {
|
||||
projectId: string;
|
||||
storage: EditHistoryStorageAdapter;
|
||||
initialState: EditHistoryState;
|
||||
now?: () => number;
|
||||
onChange: (state: EditHistoryState) => void;
|
||||
}
|
||||
|
||||
type EditHistoryMutation<T> = (state: EditHistoryState) => Promise<{
|
||||
state: EditHistoryState;
|
||||
result: T;
|
||||
}>;
|
||||
|
||||
function createEntryId(now: number): string {
|
||||
return `edit-${now.toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
|
||||
}
|
||||
|
||||
function snapshotEditHistoryState(state: EditHistoryState) {
|
||||
const undoEntry = state.undo[state.undo.length - 1] ?? null;
|
||||
const redoEntry = state.redo[state.redo.length - 1] ?? null;
|
||||
return {
|
||||
canUndo: Boolean(undoEntry),
|
||||
canRedo: Boolean(redoEntry),
|
||||
undoLabel: undoEntry?.label ?? null,
|
||||
redoLabel: redoEntry?.label ?? null,
|
||||
undoPaths: undoEntry ? Object.keys(undoEntry.files) : [],
|
||||
redoPaths: redoEntry ? Object.keys(redoEntry.files) : [],
|
||||
state,
|
||||
};
|
||||
}
|
||||
|
||||
async function readCurrentFileHashes(
|
||||
paths: string[],
|
||||
readFile: (path: string) => Promise<string>,
|
||||
): Promise<{
|
||||
currentFiles: Record<string, string>;
|
||||
currentHashes: Record<string, string>;
|
||||
}> {
|
||||
const currentFiles: Record<string, string> = {};
|
||||
const currentHashes: Record<string, string> = {};
|
||||
for (const path of paths) {
|
||||
const content = await readFile(path);
|
||||
currentFiles[path] = content;
|
||||
currentHashes[path] = hashEditHistoryContent(content);
|
||||
}
|
||||
return { currentFiles, currentHashes };
|
||||
}
|
||||
|
||||
async function writeFilesWithRollback({
|
||||
files,
|
||||
rollbackFiles,
|
||||
writeFile,
|
||||
}: {
|
||||
files: Record<string, string>;
|
||||
rollbackFiles: Record<string, string>;
|
||||
writeFile: (path: string, content: string) => Promise<void>;
|
||||
}): Promise<void> {
|
||||
const writtenPaths: string[] = [];
|
||||
try {
|
||||
for (const [path, content] of Object.entries(files)) {
|
||||
await writeFile(path, content);
|
||||
writtenPaths.push(path);
|
||||
}
|
||||
} catch (error) {
|
||||
try {
|
||||
for (const path of writtenPaths.reverse()) {
|
||||
await writeFile(path, rollbackFiles[path]);
|
||||
}
|
||||
} catch (rollbackError) {
|
||||
throw new AggregateError(
|
||||
[error, rollbackError],
|
||||
"Failed to apply edit history and rollback did not complete",
|
||||
);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
export function createPersistentEditHistoryStore({
|
||||
projectId,
|
||||
storage,
|
||||
initialState,
|
||||
now = Date.now,
|
||||
onChange,
|
||||
}: PersistentEditHistoryStoreOptions) {
|
||||
let state = initialState;
|
||||
let queue = Promise.resolve();
|
||||
|
||||
const save = async (nextState: EditHistoryState) => {
|
||||
state = nextState;
|
||||
onChange(nextState);
|
||||
try {
|
||||
await saveEditHistoryState(storage, projectId, nextState);
|
||||
} catch {
|
||||
// Keep in-memory history usable when IndexedDB is unavailable.
|
||||
}
|
||||
};
|
||||
|
||||
const mutate = async <T>(mutation: EditHistoryMutation<T>): Promise<T> => {
|
||||
const run = queue.then(async () => {
|
||||
const { state: nextState, result } = await mutation(state);
|
||||
if (nextState !== state) await save(nextState);
|
||||
return result;
|
||||
});
|
||||
queue = run.then(
|
||||
() => undefined,
|
||||
() => undefined,
|
||||
);
|
||||
return run;
|
||||
};
|
||||
|
||||
return {
|
||||
snapshot: () => snapshotEditHistoryState(state),
|
||||
async recordEdit(input: RecordEditInput) {
|
||||
await mutate<void>(async (currentState) => {
|
||||
const timestamp = now();
|
||||
const entry = buildEditHistoryEntry({
|
||||
...input,
|
||||
id: createEntryId(timestamp),
|
||||
projectId,
|
||||
now: timestamp,
|
||||
});
|
||||
return {
|
||||
state: pushEditHistoryEntry(currentState, entry),
|
||||
result: undefined,
|
||||
};
|
||||
});
|
||||
},
|
||||
async undo(callbacks: ApplyCallbacks): Promise<ApplyResult> {
|
||||
return mutate<ApplyResult>(async (currentState) => {
|
||||
const entry = currentState.undo[currentState.undo.length - 1];
|
||||
if (!entry) {
|
||||
return {
|
||||
state: currentState,
|
||||
result: { ok: false, reason: "empty" },
|
||||
};
|
||||
}
|
||||
const { currentFiles, currentHashes } = await readCurrentFileHashes(
|
||||
Object.keys(entry.files),
|
||||
callbacks.readFile,
|
||||
);
|
||||
const result = undoEditHistory(currentState, currentHashes, now());
|
||||
if (!result.ok) {
|
||||
return {
|
||||
state: currentState,
|
||||
result: { ok: false, reason: result.reason },
|
||||
};
|
||||
}
|
||||
await writeFilesWithRollback({
|
||||
files: result.filesToWrite,
|
||||
rollbackFiles: currentFiles,
|
||||
writeFile: callbacks.writeFile,
|
||||
});
|
||||
return {
|
||||
state: result.state,
|
||||
result: { ok: true, label: result.entry.label, paths: Object.keys(result.entry.files) },
|
||||
};
|
||||
});
|
||||
},
|
||||
async redo(callbacks: ApplyCallbacks): Promise<ApplyResult> {
|
||||
return mutate<ApplyResult>(async (currentState) => {
|
||||
const entry = currentState.redo[currentState.redo.length - 1];
|
||||
if (!entry) {
|
||||
return {
|
||||
state: currentState,
|
||||
result: { ok: false, reason: "empty" },
|
||||
};
|
||||
}
|
||||
const { currentFiles, currentHashes } = await readCurrentFileHashes(
|
||||
Object.keys(entry.files),
|
||||
callbacks.readFile,
|
||||
);
|
||||
const result = redoEditHistory(currentState, currentHashes, now());
|
||||
if (!result.ok) {
|
||||
return {
|
||||
state: currentState,
|
||||
result: { ok: false, reason: result.reason },
|
||||
};
|
||||
}
|
||||
await writeFilesWithRollback({
|
||||
files: result.filesToWrite,
|
||||
rollbackFiles: currentFiles,
|
||||
writeFile: callbacks.writeFile,
|
||||
});
|
||||
return {
|
||||
state: result.state,
|
||||
result: { ok: true, label: result.entry.label, paths: Object.keys(result.entry.files) },
|
||||
};
|
||||
});
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export async function createPersistentEditHistoryController({
|
||||
projectId,
|
||||
storage,
|
||||
now = Date.now,
|
||||
onChange,
|
||||
}: {
|
||||
projectId: string;
|
||||
storage: EditHistoryStorageAdapter;
|
||||
now?: () => number;
|
||||
onChange: (state: EditHistoryState) => void;
|
||||
}) {
|
||||
let state = await loadEditHistoryState(storage, projectId);
|
||||
const store = createPersistentEditHistoryStore({
|
||||
projectId,
|
||||
storage,
|
||||
initialState: state,
|
||||
now,
|
||||
onChange: (nextState) => {
|
||||
state = nextState;
|
||||
onChange(nextState);
|
||||
},
|
||||
});
|
||||
|
||||
return store;
|
||||
}
|
||||
|
||||
export function usePersistentEditHistory(options: UsePersistentEditHistoryOptions) {
|
||||
const storage = useMemo(
|
||||
() => options.storage ?? createIndexedDbEditHistoryStorage(),
|
||||
[options.storage],
|
||||
);
|
||||
const now = options.now ?? Date.now;
|
||||
const [state, setState] = useState<EditHistoryState>(() => createEmptyEditHistory());
|
||||
const [loaded, setLoaded] = useState(false);
|
||||
const projectId = options.projectId;
|
||||
const storeRef = useRef<ReturnType<typeof createPersistentEditHistoryStore> | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
const emptyState = createEmptyEditHistory();
|
||||
storeRef.current = null;
|
||||
setState(emptyState);
|
||||
setLoaded(false);
|
||||
if (!projectId) {
|
||||
setLoaded(true);
|
||||
return;
|
||||
}
|
||||
|
||||
loadEditHistoryState(storage, projectId)
|
||||
.then((loadedState) => {
|
||||
if (cancelled) return;
|
||||
storeRef.current = createPersistentEditHistoryStore({
|
||||
projectId,
|
||||
storage,
|
||||
initialState: loadedState,
|
||||
now,
|
||||
onChange: setState,
|
||||
});
|
||||
setState(loadedState);
|
||||
})
|
||||
.catch(() => {
|
||||
if (cancelled) return;
|
||||
storeRef.current = createPersistentEditHistoryStore({
|
||||
projectId,
|
||||
storage,
|
||||
initialState: emptyState,
|
||||
now,
|
||||
onChange: setState,
|
||||
});
|
||||
setState(emptyState);
|
||||
})
|
||||
.finally(() => {
|
||||
if (!cancelled) setLoaded(true);
|
||||
});
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [now, projectId, storage]);
|
||||
|
||||
const recordEdit = useCallback(async (input: RecordEditInput) => {
|
||||
await storeRef.current?.recordEdit(input);
|
||||
}, []);
|
||||
|
||||
const undo = useCallback(async (callbacks: ApplyCallbacks): Promise<ApplyResult> => {
|
||||
return storeRef.current?.undo(callbacks) ?? { ok: false, reason: "empty" };
|
||||
}, []);
|
||||
|
||||
const redo = useCallback(async (callbacks: ApplyCallbacks): Promise<ApplyResult> => {
|
||||
return storeRef.current?.redo(callbacks) ?? { ok: false, reason: "empty" };
|
||||
}, []);
|
||||
|
||||
return {
|
||||
loaded,
|
||||
...snapshotEditHistoryState(state),
|
||||
recordEdit,
|
||||
undo,
|
||||
redo,
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user