mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-09-08 02:36:10 +00:00
* feat(studio): glue API coexistence layer for the NLE swap What: extends 21 glue files so the OLD timeline/canvas engine and the NEW NLE components type-check side by side: playerStore (multi-select setters, zoom pin, snap toggle, non-reactive scale scratch), drag-state types gain optional NLE fields, timelineLayout/timelineAssetDrop/timelineEditingHelpers/ timelineEditing/timelineElementHelpers/studioHelpers/assetHelpers gain the NLE exports, DomEditOverlay + gestures + AssetContextMenu + Timeline props gain optional callbacks/params, contexts gain *Optional hooks, and TimelineEditCallbacks.onMoveElements becomes a bivariant method accepting both engines' change shapes. patchDocumentRootDuration's test rides along. Why: this is the keystone that dissolves the old "welded glue" problem — every symbol the NLE components need is ADDED next to what the old engine still uses, so the engine components and the swaps can land as separate reviewable PRs. How: 15 authored intermediate files (main content + additive symbols; no behavior changes — new fields optional, new callbacks unused until wired) plus 6 files whose final content is already purely additive. New exports without consumers yet carry TEMP(studio-dnd) ignoreExports entries, removed by the app-shell swap. Test plan: tsc --noEmit in studio + studio-server (verifies BOTH engines compile); bunx vitest run (full suite green incl. the 6 new patchDocumentRootDuration tests); fallow audit clean. * feat(studio): timeline interaction hooks and lanes component (unwired) What: the timeline-side wiring layer, unwired: TimelineLanes (the lane renderer driving drag/resize/marquee), timelineMarquee (+tests), useTimelineStackingSync, useTimelineGeometry, useTimelineEditPinning, useTimelineEditingDrops. Why: everything between the pure drag math and <Timeline> itself; the timeline-glue swap PR then only rewires Timeline/TimelineCanvas onto these. How: new files, tsc-clean against the coexistence layer. Unwired components carry TEMP(studio-dnd) entry registrations, removed at the app-shell swap. Test plan: bunx vitest run timelineMarquee.test.ts; tsc --noEmit; fallow audit clean. * feat(studio): NLE shell assembly (unwired) What: EditorShell (the full editor layout replacing NLELayout + StudioPreviewArea), TimelinePane (timeline host with sub-comp rebasing) and useTimelineEditCallbacks (the callback bag bridging store edits to the timeline), all unwired. Why: the shell that App swaps to in the final step; reviewing it standalone keeps that swap PR small. How: new files against the coexistence layer; TEMP(studio-dnd) entries until App mounts EditorShell in the app-shell swap. Test plan: tsc --noEmit; bunx vitest run (suite unchanged); fallow audit clean. * feat(studio): timeline glue swap — Timeline/TimelineCanvas onto the NLE engine What: flips the timeline glue to its final form (23 files): Timeline and TimelineCanvas rebuilt on TimelineLanes/TimelineOverlays, useTimelineClipDrag drives preview/commit through the new drag engine, range selection goes multi-select, playback loop moves to useTimelinePlayerLoop. Deletes the 9 old-engine files this orphans (group drag, marquee selection, snap targets, layer gutter, selection overlays + their suites) — each is compile- or gate-forced by this swap, verified by probe. Why: second swap step; timeline-only, canvas and App untouched. How: modified files to final content + forced deletions. playerStore/timelineEditing/timelineCallbacks stay at their coexistence form until the app swap (the old App still runs on them). Test plan: tsc --noEmit; bunx vitest run (full suite); fallow audit clean. * feat(studio): clip thumbnail modules What: ImageThumbnail (+tests) and thumbnailUtils (+tests) — frame decode with SVG/AVIF format fallbacks and rounded-corner clipping — plus VideoThumbnail updates. Why: the decode layer for timeline clip thumbnails, ahead of the visual refresh that renders them. How: new modules + one modified file; purely presentational. Test plan: bunx vitest run on both test files; tsc --noEmit; fallow audit clean. * feat(studio): assets/blocks panel behaviors + preview helpers What: blocks tab install flow, right-panel and global drag-overlay polish, music beat analysis and clip-content rendering hooks, and the preview-helper utilities backing asset preview. Why: completes the studio NLE stack on top of the visual refresh. How: modified files only (kept as one PR: splitting further would produce sub-150-LOC fragments of interdependent panel glue). Test plan: bunx vitest run studioPreviewHelpers/studioUrlState suites; tsc --noEmit; fallow audit clean. * fix(studio): restore timeline playback loop * fix(studio): restore missing GSAP helpers module * refactor(studio): split timeline GSAP helpers * style(studio): keep timeline helper under size limit * fix(studio): restore timeline overlays module * fix(studio): remove stale GSAP import * fix(studio): restore canonical timeline dependencies * style(studio): format restored timeline helpers * style(studio): satisfy helper line limit * fix(studio): repair rebuilt timeline integration * feat(studio): complete rebuilt NLE cutover * fix(studio): guard project and timeline race boundaries * fix(studio): preserve graded resize and crop geometry * fix(studio): log resize/rotate commit failures, move anchor accumulator to resize-local * fix(studio): treat duration-0 tweens as static holds and settle resize position before persist Instant holds (to()/fromTo() with duration 0) were classified as animated tweens by every commit route, so resizing or rotating them converted the hold into a corrupt duration-0 keyframes tween (new value at 0%, old at 100%) that GSAP drops; panel edits appended a losing set. A shared isInstantHold() now routes them through the static replace-in-place path, and percentage math guards zero-duration windows. Separately, anchored-corner resizes painted 3-5 frames at the new size but old position while the offset persist round-tripped the server. The commit path now applies the corrected GSAP position synchronously before awaiting the offset persist, mirroring the scale route's settle. * feat(studio): gesture-transaction seam with commit observability Introduce runGestureTransaction — one owner for a gesture commit's settle -> persist -> record lifecycle. It settles the live DOM synchronously before any async persist, folds every mutation into one undo entry via a per-transaction coalesceKey, restores pre-gesture state exactly once on failure, and asserts (dev console) + reports (PostHog: commit_transaction / commit_invariant_violation / commit_transaction_failed) that a persist never changes pixels. The box-size resize path is migrated onto it; the ad hoc per-route coalesceKey/reload handling is removed. Extract the resize draft-rect math into resizeDraft.ts to keep the gesture-handler file under the size cap. Also: keep url_hash telemetry to the route slug only (drop the query string, which carried the user's selected element id/selector), and gate the [hf-resize] diagnostics behind localStorage hf-resize-debug so they ship as opt-in tracing rather than console noise. * fix(studio): transaction owns the undo label The coalesced history entry took the last sub-mutation's label, so a resize surfaced as "Move layer" (the offset persist) in undo/redo. The seam now stamps tx.label on every wrapped mutation, so the folded entry reads as the gesture. * fix(studio): atomic static size/position commits (no data loss) Static resize/position holds updated an existing set via delete+add — two undo entries, and a delete that succeeded before a failed add lost the hold on disk. Use one in-place update-properties mutation when a set exists (one undo entry, no partial-failure window). The keyframed-hold heal that can't be expressed as a property update now adds before it deletes, so any single failure leaves a recoverable duplicate, never a lost hold. Transaction-owned commits are tracked via a WeakSet so the heal path never double-wraps an already-wrapped gesture. * fix(core): restore timed-clip visibility after a forced timeline rebind __hfForceTimelineRebind force-rendered the re-registered timeline but never re-ran the per-[data-start] visibility pass, so after undo or soft reload every clip rendered regardless of its time window until a full page reload. Extract the visibility loop into syncTimedElementVisibility and call it from both syncMediaForCurrentState (unchanged) and the rebind. * fix(studio): atomic z-order/keyframe/split commits, one undo entry each Three edit-commit paths hardened onto the one-transaction invariant: - Z-order reorder (useElementLifecycleOps): N per-element writes now fold into one undo entry (coalesceMs Infinity) and, on a failed persist, restore already-written files to disk so no partial reorder survives. - Enable-keyframes (useEnableKeyframes/useGsapKeyframeOps): the intermediate convert phase no longer full-reloads the preview (skipReload), killing the black-flash remount; convert + edit share one coalesce key = one undo entry. - Razor split-all (useRazorSplit): snapshot before the batch and restore on any failure, so a mid-batch error never leaves un-revertable partial splits. Shared file-history helpers (RecordEditInput, DomEditCommitBaseParams, readProjectFileContent, restoreFilesToOriginal) dedupe the rollback/commit logic across these paths. Commit options thread as one partial object rather than field-by-field. Test setup extracted into colocated helpers. * fix(studio): fold multi-step edits into one undo entry; guard text revert - Gesture recording (useGestureCommit): the per-property-group commits now share one coalesce key and only the last reloads, so a recording is one undo entry and one preview reload instead of up to four. - Delete selected keyframes (deleteSelectedKeyframes, split out of timelineEditingHelpers): N removals fold into one coalesced undo entry with a single reload. - Text-field commit (useDomEditTextCommits): commitDomTextFields now uses the same version-guarded revert as handleDomTextCommit, so a stale failed commit can no longer stomp a newer successful one. * feat(studio): batch a gesture's mutations into one atomic server write A transaction that emits N mutations previously did N sequential POSTs, each rewriting the file and soft-reloading — the root of the multi-phase persist window. Add a gsap-mutations-batch endpoint that validates every mutation up front, applies them in one in-memory rewrite chain, and writes the file once (all-or-nothing: an invalid entry rejects the whole batch, no partial write). The seam buffers a transaction's commits and, when more than one targets the same file, dispatches a single batch — one write, one history entry, one reload. The batch capability rides on the existing commit-function reference; no option fields are threaded through callers. * fix(studio): soften off-canvas indicator outline to 30% opacity The dashed off-canvas selection outline at 60% was noisy with many protruding elements on screen; drop the resting opacity to 30% (hover still restores full opacity so it stays discoverable). * fix(studio): drop off-canvas indicator outline to 10% opacity Follow-up to the 30% softening — 10% resting opacity reads much calmer with many protruding elements; hover still restores full opacity. * fix(studio): gate [hf-commit] console traces to dev only The start/settled/persisted/restore lifecycle traces logged on every gesture commit in all environments — console noise for end users. Route them through a dev-only traceCommit helper (matching the pixel-violation error's existing DEV gate). The commit_* PostHog events stay always on; they are the production observability, the console lines are a dev aid. * fix(studio): count actual reloads, not softReload requests, in commit telemetry A resize's size and offset persists both request softReload; the seam counted each request, so a batched gesture reported reload_count 2 even though the batch is one write and one reload. Compute the count from what dispatchBufferedCommits actually did — one for a batch, the request count for the sequential fallback. * fix(studio): rotate hover + off-canvas overlays with the element; flicker-free crop - Hover overlay applied the element's rotation only to the selection chrome, not the hover box; it now rotates about center like the selection, via a shared orientedGroupAwareOverlayRect router (one owner for rotation-aware overlay geometry across hover/selection/off-canvas). - Off-canvas indicator was axis-aligned; it now rotates with the element and inverse-rotates the canvas-exclusion clip into the element's local frame, so the protruding-sliver clip stays correct for rotated elements. - Crop commit re-lifted the element only in the commit's .then(), so one frame painted the cropped state (the flicker). Re-lift synchronously right after onStyleCommit (which applies the clip before its first await), so the cropped state never paints; the persisted file value is unchanged. * fix(studio): address code-review findings across the commit-hardening campaign Correctness (would ship green, bite under latency): - Enable-keyframes phase 2 now carries coalesceMs: Infinity, so the convert folds into one undo entry instead of splitting past the 300ms default. - The SDK keyframe persist path forwards coalesceMs (CutoverOptions gains the field); multi-keyframe delete and convert coalesce correctly when SDK-routed. - Razor split-all's rollback is guarded so a failing restore can't swallow the error toast that tells the user the split failed. Simplification (single source of truth / no dead flexibility): - Decompose resolveResizeDraftRect (drops a fallow-ignore suppression). - Delegate the third readProjectFileContent copy to the shared helper. - Inline setPatchFromUpdateProperties (its only caller passes one mutation). - One toSdkPersistOptions translates gesture overrides to SDK options. - Bundle the reorder-rollback deps into one object (was 7-9 positional args). - Dedupe the 'last group reloads' ternary; type gesture options as CommitMutationOptions; drop a Map+array wrapper around a single write. * feat(studio): atomic z-order reorder via batch patch-element endpoint Z-order reorder issued N per-element inline-style patches (one server write each), so a mid-chain failure could leave a partial reorder on disk. Add a patch-elements-batch endpoint that validates every patch, folds them over the file in one in-memory rewrite, and writes once (all-or-nothing; unsafe input rejects with no write). The reorder now sends one batch per source file and records one undo entry. Because a failed atomic write persists nothing, the interim disk-write-back rollback (restoreReorderedFile / restoreFulfilledReorderFiles / ReorderRollbackDeps) is deleted — failure rolls back only live DOM/store state. Closes the last disk-atomicity gap. * fix(studio): razor-split undo no longer silently no-ops The split clone was written to disk without a data-hf-id, so the split endpoint recorded that unstamped HTML as the undo entry's afterHash. The next reloadPreview() ran the preview route's ensureHfIds write-back, which minted a fresh id and persisted DIFFERENT bytes — so at undo time the disk hash no longer matched afterHash and editHistory's content-mismatch guard silently refused the undo (no write, no network, no error). Stamp the split output via ensureHfIds in splitElementInHtml before it is written/returned, so the preview write-back is a no-op and the recorded afterHash always equals the final on-disk bytes. Fixes at the source rather than relaxing the mismatch guard. Corrects the stale comment that credited forceReloadSdkSession. * feat(studio): closed-hand grab cursor on the rotate handle The rotate handle used the default arrow cursor; show a grabbing (closed-hand) cursor on hover to signal it's grabbed and dragged to rotate. * fix(studio): dropping a dragged element over another no longer selects it A moved drag's release fired the box click, which re-selected whatever now sat under the pointer via the hover cache — so dropping an element over a higher-z one selected the drop target instead of keeping the dragged element selected. The drag-move branch now suppresses the next box click, mirroring the resize branch. * fix(studio): group drag is one undo entry, not one per element Dragging a multi-selected group committed each member's position write as its own undo entry, so reverting took N Cmd+Z presses. Force a shared coalesceKey (infinite window) across every member's commit so they fold into a single undo entry, like the other multi-step commit paths. * fix(studio): undo of a split no longer leaves a ghost clip in the timeline The file and the composition iframe revert correctly on undo, but the timeline panel kept a ghost node for the split clone. The element-merge that repopulates the timeline preserves elements the fresh scan dropped — intended for enriched sub-composition children a bare DOM re-scan misses, but it also preserved a genuinely-removed TOP-LEVEL element (the split clone after undo), leaving a phantom clip. Restrict the preserve to elements with a compositionSrc (the enriched sub-comp children); a top-level element missing from the fresh scan was truly removed. --------- Co-authored-by: ukimsanov <ular.kimsanov@heygen.com>
553 lines
20 KiB
TypeScript
553 lines
20 KiB
TypeScript
// fallow-ignore-file code-duplication
|
|
/**
|
|
* Gesture handling for DomEditOverlay.
|
|
* Owns: onPointerMove, onPointerUp, clearPointerState.
|
|
* startGesture and startGroupDrag live in domEditOverlayStartGesture.ts.
|
|
*/
|
|
import type { RefObject } from "react";
|
|
import { type DomEditSelection } from "./domEditing";
|
|
import {
|
|
applyManualOffsetDragCommit,
|
|
applyManualOffsetDragDraft,
|
|
applyRotationDraftViaGsap,
|
|
endManualOffsetDragMembers,
|
|
restoreManualOffsetDragMembers,
|
|
resumeGsapTimelines,
|
|
} from "./manualOffsetDrag";
|
|
import {
|
|
applyStudioBoxSize,
|
|
applyStudioBoxSizeDraft,
|
|
applyStudioRotation,
|
|
applyStudioRotationDraft,
|
|
endStudioManualEditGesture,
|
|
isStudioManualEditGestureCurrent,
|
|
readStudioBoxSize,
|
|
restoreStudioBoxSize,
|
|
restoreStudioPathOffset,
|
|
restoreStudioRotation,
|
|
} from "./manualEdits";
|
|
import {
|
|
type GroupOverlayItem,
|
|
type OverlayRect,
|
|
orientedOverlayRect,
|
|
resolveDomEditGroupOverlayRect,
|
|
} from "./domEditOverlayGeometry";
|
|
import {
|
|
BLOCKED_MOVE_THRESHOLD_PX,
|
|
type GestureKind,
|
|
type GestureState,
|
|
type GroupGestureState,
|
|
type ResizeHandle,
|
|
type UseDomEditOverlayGesturesOptions,
|
|
ROTATED_SNAP_BYPASS_DEGREES,
|
|
hasDomEditRotationChanged,
|
|
resolveDomEditRotationGesture,
|
|
} from "./domEditOverlayGestures";
|
|
import { resolveCenterResizeSize } from "./domEditResizeLocal";
|
|
import { resolveResizeDraftRect } from "./resizeDraft";
|
|
import {
|
|
startGesture as _startGesture,
|
|
startGroupDrag as _startGroupDrag,
|
|
} from "./domEditOverlayStartGesture";
|
|
import { hugRectForElement } from "./domEditOverlayCrop";
|
|
import { resolveSnapAdjustment, resolveEquidistanceGuides, SNAP_THRESHOLD_PX } from "./snapEngine";
|
|
import { logResize, logResizeMove, logResizeSettle } from "../../utils/resizeDebug";
|
|
|
|
export function createDomEditOverlayGestureHandlers(opts: UseDomEditOverlayGesturesOptions) {
|
|
const setDraftOverlayRect = (next: OverlayRect) => {
|
|
opts.setOverlayRect(next);
|
|
};
|
|
const restoreGestureOverlayRect = (g: GestureState) => {
|
|
setDraftOverlayRect({
|
|
left: g.originLeft,
|
|
top: g.originTop,
|
|
width: g.originWidth,
|
|
height: g.originHeight,
|
|
editScaleX: g.editScaleX,
|
|
editScaleY: g.editScaleY,
|
|
// Every draft rect must carry the element's rotation: the rotation wrapper
|
|
// renders rotate(overlayRect.angle), so an omitted angle straightens the
|
|
// chrome for the duration of the draft (the "straightens while moving" bug).
|
|
angle: g.actualRotation,
|
|
});
|
|
};
|
|
const setDraftGroupOverlayItems = (next: GroupOverlayItem[]) => {
|
|
opts.setGroupOverlayItems(next);
|
|
};
|
|
|
|
const restoreGroupPathOffsets = (g: GroupGestureState) => {
|
|
restoreManualOffsetDragMembers(g.members);
|
|
setDraftGroupOverlayItems(g.originItems);
|
|
};
|
|
|
|
const startGroupDrag = (e: React.PointerEvent<HTMLElement>) => _startGroupDrag(e, opts);
|
|
const startGesture = (
|
|
kind: GestureKind,
|
|
e: React.PointerEvent<HTMLElement>,
|
|
options?: {
|
|
selection?: DomEditSelection;
|
|
rect?: OverlayRect | null;
|
|
resizeHandle?: ResizeHandle;
|
|
},
|
|
) => _startGesture(kind, e, opts, options);
|
|
|
|
// fallow-ignore-next-line complexity
|
|
const onPointerMove = (e: React.PointerEvent<HTMLDivElement>) => {
|
|
const g = opts.gestureRef.current;
|
|
const groupG = opts.groupGestureRef.current;
|
|
const sel = g?.selection ?? opts.selectionRef.current;
|
|
const box = opts.boxRef.current;
|
|
const blockedMove = opts.blockedMoveRef.current;
|
|
if (!blockedMove && !g && !groupG) {
|
|
opts.onCanvasPointerMoveRef.current(e, { preferClipAncestor: false });
|
|
}
|
|
|
|
if (blockedMove && sel) {
|
|
const dx = e.clientX - blockedMove.startX;
|
|
const dy = e.clientY - blockedMove.startY;
|
|
if (!blockedMove.notified && Math.hypot(dx, dy) >= BLOCKED_MOVE_THRESHOLD_PX) {
|
|
blockedMove.notified = true;
|
|
opts.suppressNextBoxClickRef.current = true;
|
|
opts.onBlockedMoveRef.current(sel);
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (groupG) {
|
|
let dx = e.clientX - groupG.startX;
|
|
let dy = e.clientY - groupG.startY;
|
|
|
|
const sc = groupG.snapContext;
|
|
if (sc?.snapEnabled && sc.targets.length > 0) {
|
|
const groupBounds = resolveDomEditGroupOverlayRect(
|
|
groupG.originItems.map((item) => item.rect),
|
|
);
|
|
if (groupBounds) {
|
|
const allTargets = sc.compositionTarget
|
|
? [...sc.targets, sc.compositionTarget]
|
|
: sc.targets;
|
|
const snap = resolveSnapAdjustment({
|
|
movingRect: groupBounds,
|
|
proposedDx: dx,
|
|
proposedDy: dy,
|
|
targets: allTargets,
|
|
gridEdges: sc.gridEdges ?? undefined,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: e.altKey,
|
|
});
|
|
dx = snap.dx;
|
|
dy = snap.dy;
|
|
const movedRect = {
|
|
left: groupBounds.left + dx,
|
|
top: groupBounds.top + dy,
|
|
width: groupBounds.width,
|
|
height: groupBounds.height,
|
|
};
|
|
const spacingGuides = e.altKey
|
|
? []
|
|
: resolveEquidistanceGuides({
|
|
movingRect: movedRect,
|
|
targets: allTargets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
});
|
|
opts.snapGuidesRef.current = { guides: snap.guides, spacingGuides };
|
|
}
|
|
}
|
|
groupG.lastSnappedDx = dx;
|
|
groupG.lastSnappedDy = dy;
|
|
|
|
setDraftGroupOverlayItems(
|
|
groupG.originItems.map((item) => ({
|
|
...item,
|
|
rect: { ...item.rect, left: item.rect.left + dx, top: item.rect.top + dy },
|
|
})),
|
|
);
|
|
for (const member of groupG.members) applyManualOffsetDragDraft(member, dx, dy);
|
|
return;
|
|
}
|
|
|
|
if (!g || !sel) return;
|
|
let dx = e.clientX - g.startX;
|
|
let dy = e.clientY - g.startY;
|
|
|
|
if (g.kind === "rotate") {
|
|
// Single source of truth: preview the rotation through the GSAP channel (the
|
|
// same channel the commit lands in), not the `--hf-studio-rotation` CSS var.
|
|
const rotated = resolveDomEditRotationGesture({
|
|
centerX: g.centerX,
|
|
centerY: g.centerY,
|
|
startX: g.startX,
|
|
startY: g.startY,
|
|
currentX: e.clientX,
|
|
currentY: e.clientY,
|
|
actualAngle: g.actualRotation,
|
|
snap: e.shiftKey,
|
|
});
|
|
if (!applyRotationDraftViaGsap(sel.element, rotated.angle)) {
|
|
applyStudioRotationDraft(sel.element, rotated);
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (g.kind === "drag") {
|
|
const sc = g.snapContext;
|
|
// Bypass edge-snapping for rotated elements — the snap targets and the
|
|
// snapped rect are axis-aligned, so snapping a rotated box's AABB shifts it
|
|
// unpredictably. Rotation ~0 keeps snapping exactly as before.
|
|
const dragRotated = Math.abs(g.actualRotation) >= ROTATED_SNAP_BYPASS_DEGREES;
|
|
if (!dragRotated && sc?.snapEnabled && sc.targets.length > 0) {
|
|
// Snap the element's VISIBLE (crop-hugged) edges, not the full bounds.
|
|
const movingRect = hugRectForElement(
|
|
{
|
|
left: g.originLeft,
|
|
top: g.originTop,
|
|
width: g.originWidth,
|
|
height: g.originHeight,
|
|
editScaleX: g.editScaleX,
|
|
editScaleY: g.editScaleY,
|
|
},
|
|
g.selection.element,
|
|
);
|
|
const allTargets = sc.compositionTarget
|
|
? [...sc.targets, sc.compositionTarget]
|
|
: sc.targets;
|
|
const snap = resolveSnapAdjustment({
|
|
movingRect,
|
|
proposedDx: dx,
|
|
proposedDy: dy,
|
|
targets: allTargets,
|
|
gridEdges: sc.gridEdges ?? undefined,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: e.altKey,
|
|
});
|
|
dx = snap.dx;
|
|
dy = snap.dy;
|
|
const movedRect = {
|
|
left: movingRect.left + dx,
|
|
top: movingRect.top + dy,
|
|
width: movingRect.width,
|
|
height: movingRect.height,
|
|
};
|
|
const spacingGuides = e.altKey
|
|
? []
|
|
: resolveEquidistanceGuides({
|
|
movingRect: movedRect,
|
|
targets: allTargets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
});
|
|
opts.snapGuidesRef.current = { guides: snap.guides, spacingGuides };
|
|
}
|
|
g.lastSnappedDx = dx;
|
|
g.lastSnappedDy = dy;
|
|
|
|
const nextBoxLeft = g.originLeft + dx;
|
|
const nextBoxTop = g.originTop + dy;
|
|
setDraftOverlayRect({
|
|
left: nextBoxLeft,
|
|
top: nextBoxTop,
|
|
width: g.originWidth,
|
|
height: g.originHeight,
|
|
editScaleX: g.editScaleX,
|
|
editScaleY: g.editScaleY,
|
|
angle: g.actualRotation,
|
|
});
|
|
if (box) {
|
|
box.style.left = `${nextBoxLeft}px`;
|
|
box.style.top = `${nextBoxTop}px`;
|
|
}
|
|
if (g.pathOffsetMember) applyManualOffsetDragDraft(g.pathOffsetMember, dx, dy);
|
|
} else {
|
|
if (!box) return;
|
|
|
|
// CENTER-ANCHORED size (CapCut model): the element scales proportionally
|
|
// about its CENTER — the scale is the pointer's RADIAL distance from the
|
|
// element center now over its distance at gesture start. Rotation-invariant
|
|
// (a distance ignores the angle) and continuous, so all four corners behave
|
|
// identically and there is no per-axis projection or edge-snapping. Base size
|
|
// is the element-local px size at gesture start (actualWidth/Height,
|
|
// GSAP-scale-aware). Corner drag is ALWAYS proportional; there is no
|
|
// free-form stretch gesture. Edge-snapping is intentionally NOT applied:
|
|
// with center anchoring both edges move symmetrically, so the corner-anchored
|
|
// snap math no longer holds — CapCut does not edge-snap during scale either.
|
|
const nextSize = resolveCenterResizeSize({
|
|
baseWidth: g.actualWidth,
|
|
baseHeight: g.actualHeight,
|
|
pointer: { x: e.clientX, y: e.clientY },
|
|
pointerStart: { x: g.startX, y: g.startY },
|
|
centerStart: { x: g.centerX, y: g.centerY },
|
|
});
|
|
applyStudioBoxSizeDraft(sel.element, nextSize);
|
|
|
|
const overlayEl = opts.overlayRef.current;
|
|
const iframe = opts.iframeRef.current;
|
|
const measureOrientedRect = () =>
|
|
overlayEl && iframe ? orientedOverlayRect(overlayEl, iframe, sel.element) : null;
|
|
|
|
const draftRect = resolveResizeDraftRect(
|
|
g,
|
|
sel.element,
|
|
overlayEl,
|
|
iframe,
|
|
measureOrientedRect,
|
|
);
|
|
logResizeMove({
|
|
pointer: { x: e.clientX, y: e.clientY },
|
|
nextSize,
|
|
anchor: g.lastResizeAnchor ?? null,
|
|
draftRect,
|
|
liveInlineStyle: sel.element.getAttribute("style"),
|
|
});
|
|
box.style.left = `${draftRect.left}px`;
|
|
box.style.top = `${draftRect.top}px`;
|
|
box.style.width = `${draftRect.width}px`;
|
|
box.style.height = `${draftRect.height}px`;
|
|
setDraftOverlayRect(draftRect);
|
|
}
|
|
};
|
|
|
|
// fallow-ignore-next-line complexity
|
|
const onPointerUp = (e: React.PointerEvent<HTMLDivElement>) => {
|
|
opts.snapGuidesRef.current = null;
|
|
const g = opts.gestureRef.current;
|
|
const groupG = opts.groupGestureRef.current;
|
|
const sel = g?.selection ?? opts.selectionRef.current;
|
|
const box = opts.boxRef.current;
|
|
opts.blockedMoveRef.current = null;
|
|
|
|
if (groupG) {
|
|
opts.groupGestureRef.current = null;
|
|
opts.rafPausedRef.current = false;
|
|
const rawDx = e.clientX - groupG.startX;
|
|
const rawDy = e.clientY - groupG.startY;
|
|
if (Math.hypot(rawDx, rawDy) < BLOCKED_MOVE_THRESHOLD_PX) {
|
|
restoreGroupPathOffsets(groupG);
|
|
opts.suppressNextBoxClickRef.current = true;
|
|
return;
|
|
}
|
|
const dx = groupG.lastSnappedDx ?? rawDx;
|
|
const dy = groupG.lastSnappedDy ?? rawDy;
|
|
setDraftGroupOverlayItems(
|
|
groupG.originItems.map((item) => ({
|
|
...item,
|
|
rect: { ...item.rect, left: item.rect.left + dx, top: item.rect.top + dy },
|
|
})),
|
|
);
|
|
const updates = groupG.members.map((member) => ({
|
|
selection: member.selection,
|
|
next: applyManualOffsetDragCommit(member, dx, dy),
|
|
}));
|
|
void Promise.resolve(opts.onGroupPathOffsetCommitRef.current(updates))
|
|
.catch(() => {
|
|
for (const member of groupG.members) {
|
|
if (
|
|
member.gestureToken &&
|
|
isStudioManualEditGestureCurrent(member.element, member.gestureToken)
|
|
)
|
|
restoreStudioPathOffset(member.element, member.initialPathOffset);
|
|
}
|
|
})
|
|
.finally(() => endManualOffsetDragMembers(groupG.members));
|
|
return;
|
|
}
|
|
|
|
if (!g || !sel) {
|
|
opts.gestureRef.current = null;
|
|
opts.rafPausedRef.current = false;
|
|
return;
|
|
}
|
|
opts.gestureRef.current = null;
|
|
opts.rafPausedRef.current = false;
|
|
const movedDistance = Math.hypot(e.clientX - g.startX, e.clientY - g.startY);
|
|
|
|
if (g.kind === "drag" && movedDistance < BLOCKED_MOVE_THRESHOLD_PX) {
|
|
restoreStudioPathOffset(sel.element, g.initialPathOffset);
|
|
endStudioManualEditGesture(sel.element, g.manualEditDragToken);
|
|
resumeGsapTimelines(sel.element);
|
|
if (box) {
|
|
box.style.left = `${g.originLeft}px`;
|
|
box.style.top = `${g.originTop}px`;
|
|
}
|
|
restoreGestureOverlayRect(g);
|
|
opts.suppressNextBoxClickRef.current = true;
|
|
opts.onCanvasMouseDown(e as unknown as React.MouseEvent<HTMLDivElement>, {
|
|
preferClipAncestor: false,
|
|
hoverSelection: opts.hoverSelectionRef.current,
|
|
});
|
|
return;
|
|
}
|
|
|
|
if (g.kind === "resize" && movedDistance < BLOCKED_MOVE_THRESHOLD_PX) {
|
|
restoreStudioBoxSize(sel.element, g.initialBoxSize);
|
|
if (g.pathOffsetMember) {
|
|
restoreManualOffsetDragMembers([g.pathOffsetMember]);
|
|
} else {
|
|
endStudioManualEditGesture(sel.element, g.manualEditDragToken);
|
|
}
|
|
if (box) {
|
|
box.style.width = `${g.originWidth}px`;
|
|
box.style.height = `${g.originHeight}px`;
|
|
}
|
|
restoreGestureOverlayRect(g);
|
|
opts.suppressNextBoxClickRef.current = true;
|
|
return;
|
|
}
|
|
|
|
if (g.kind === "rotate") {
|
|
const finalRotation = resolveDomEditRotationGesture({
|
|
centerX: g.centerX,
|
|
centerY: g.centerY,
|
|
startX: g.startX,
|
|
startY: g.startY,
|
|
currentX: e.clientX,
|
|
currentY: e.clientY,
|
|
actualAngle: g.actualRotation,
|
|
snap: e.shiftKey,
|
|
});
|
|
const restoreRotation = () => {
|
|
// Single source of truth: snap the GSAP rotation back to the gesture's base
|
|
// angle; fall back to the legacy CSS-var restore when gsap is unavailable.
|
|
if (!applyRotationDraftViaGsap(sel.element, g.actualRotation)) {
|
|
restoreStudioRotation(sel.element, g.initialRotation);
|
|
}
|
|
};
|
|
if (!hasDomEditRotationChanged(g.actualRotation, finalRotation.angle)) {
|
|
restoreRotation();
|
|
endStudioManualEditGesture(sel.element, g.manualEditDragToken);
|
|
return;
|
|
}
|
|
// Keep the preview at the final angle through the GSAP channel (NOT the CSS var)
|
|
// while the commit lands a `tl.set`/keyframe rotation on the timeline.
|
|
if (!applyRotationDraftViaGsap(sel.element, finalRotation.angle)) {
|
|
applyStudioRotation(sel.element, finalRotation);
|
|
}
|
|
void Promise.resolve(opts.onRotationCommitRef.current(sel, finalRotation))
|
|
.catch((error) => {
|
|
console.error("rotate commit failed", error);
|
|
if (
|
|
g.manualEditDragToken &&
|
|
isStudioManualEditGestureCurrent(sel.element, g.manualEditDragToken)
|
|
)
|
|
restoreRotation();
|
|
})
|
|
.finally(() => endStudioManualEditGesture(sel.element, g.manualEditDragToken));
|
|
} else if (g.kind === "drag") {
|
|
// A moved drag (taps returned earlier) must not let the release click
|
|
// re-select whatever now sits under the pointer — dropping over a
|
|
// higher-z element should keep the dragged element selected, not select
|
|
// the drop target. Mirrors the resize branch below.
|
|
opts.suppressNextBoxClickRef.current = true;
|
|
const dx = g.lastSnappedDx ?? e.clientX - g.startX;
|
|
const dy = g.lastSnappedDy ?? e.clientY - g.startY;
|
|
if (!g.pathOffsetMember) {
|
|
return;
|
|
}
|
|
const finalOffset = applyManualOffsetDragCommit(g.pathOffsetMember, dx, dy);
|
|
const nextBoxLeft = g.originLeft + dx;
|
|
const nextBoxTop = g.originTop + dy;
|
|
setDraftOverlayRect({
|
|
left: nextBoxLeft,
|
|
top: nextBoxTop,
|
|
width: g.originWidth,
|
|
height: g.originHeight,
|
|
editScaleX: g.editScaleX,
|
|
editScaleY: g.editScaleY,
|
|
angle: g.actualRotation,
|
|
});
|
|
if (box) {
|
|
box.style.left = `${nextBoxLeft}px`;
|
|
box.style.top = `${nextBoxTop}px`;
|
|
}
|
|
void Promise.resolve(
|
|
opts.onPathOffsetCommitRef.current(sel, finalOffset, { altKey: e.altKey }),
|
|
)
|
|
.catch(() => {
|
|
if (
|
|
g.pathOffsetMember?.gestureToken &&
|
|
isStudioManualEditGestureCurrent(sel.element, g.pathOffsetMember.gestureToken)
|
|
)
|
|
restoreStudioPathOffset(sel.element, g.initialPathOffset);
|
|
})
|
|
.finally(() => {
|
|
if (g.pathOffsetMember) endManualOffsetDragMembers([g.pathOffsetMember]);
|
|
});
|
|
} else {
|
|
opts.suppressNextBoxClickRef.current = true;
|
|
const finalSize = readStudioBoxSize(sel.element);
|
|
applyStudioBoxSize(sel.element, finalSize);
|
|
// Anchored corner resize (NW/NE/SW) also moved the element to keep the
|
|
// center planted. Land the size AND the anchor offset in a SINGLE
|
|
// box-size commit (one persist, one undo entry). The prior two-commit
|
|
// sequence re-stamped the element from source after the size-only persist
|
|
// but before the offset persist landed — that one frame (new size, old
|
|
// offset) was the release "jump". SE has no anchor member → size only.
|
|
const member = g.pathOffsetMember;
|
|
const anchor = g.lastResizeAnchor;
|
|
const finalOffset =
|
|
member && anchor && (anchor.dx !== 0 || anchor.dy !== 0)
|
|
? applyManualOffsetDragCommit(member, anchor.dx, anchor.dy)
|
|
: null;
|
|
logResize("release", {
|
|
finalSize,
|
|
anchor: anchor ?? null,
|
|
finalOffset: finalOffset ?? null,
|
|
hasMember: !!member,
|
|
inlineStyle: sel.element.getAttribute("style"),
|
|
});
|
|
const restore = () => {
|
|
if (
|
|
!g.manualEditDragToken ||
|
|
!isStudioManualEditGestureCurrent(sel.element, g.manualEditDragToken)
|
|
)
|
|
return;
|
|
restoreStudioBoxSize(sel.element, g.initialBoxSize);
|
|
if (finalOffset) restoreStudioPathOffset(sel.element, g.initialPathOffset);
|
|
};
|
|
void Promise.resolve(
|
|
opts.onBoxSizeCommitRef.current(sel, finalSize, finalOffset ?? undefined, restore),
|
|
)
|
|
.catch((error) => {
|
|
console.error("resize commit failed", error);
|
|
})
|
|
.finally(() => {
|
|
if (member) endManualOffsetDragMembers([member]);
|
|
else endStudioManualEditGesture(sel.element, g.manualEditDragToken);
|
|
});
|
|
logResizeSettle(sel.element, "post-release");
|
|
}
|
|
};
|
|
|
|
// fallow-ignore-next-line complexity
|
|
const clearPointerState = (selectionRef: RefObject<DomEditSelection | null>) => {
|
|
opts.snapGuidesRef.current = null;
|
|
const groupG = opts.groupGestureRef.current;
|
|
if (groupG) restoreGroupPathOffsets(groupG);
|
|
const g = opts.gestureRef.current;
|
|
const sel = g?.selection ?? selectionRef.current;
|
|
if (g?.mode === "path-offset" && sel) {
|
|
restoreStudioPathOffset(sel.element, g.initialPathOffset);
|
|
endStudioManualEditGesture(sel.element, g.manualEditDragToken);
|
|
resumeGsapTimelines(sel.element);
|
|
restoreGestureOverlayRect(g);
|
|
}
|
|
if (g?.mode === "box-size" && sel) {
|
|
restoreStudioBoxSize(sel.element, g.initialBoxSize);
|
|
if (g.pathOffsetMember) {
|
|
restoreManualOffsetDragMembers([g.pathOffsetMember]);
|
|
} else {
|
|
endStudioManualEditGesture(sel.element, g.manualEditDragToken);
|
|
}
|
|
restoreGestureOverlayRect(g);
|
|
}
|
|
if (g?.mode === "rotation" && sel) {
|
|
restoreStudioRotation(sel.element, g.initialRotation);
|
|
endStudioManualEditGesture(sel.element, g.manualEditDragToken);
|
|
}
|
|
opts.blockedMoveRef.current = null;
|
|
opts.groupGestureRef.current = null;
|
|
opts.gestureRef.current = null;
|
|
opts.rafPausedRef.current = false;
|
|
};
|
|
|
|
return { startGesture, startGroupDrag, onPointerMove, onPointerUp, clearPointerState };
|
|
}
|