mirror of
https://github.com/heygen-com/hyperframes.git
synced 2026-09-07 18:26:17 +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>
592 lines
20 KiB
TypeScript
592 lines
20 KiB
TypeScript
// fallow-ignore-file code-duplication
|
|
import { describe, test, expect } from "vitest";
|
|
import {
|
|
extractSnapTargets,
|
|
buildCompositionSnapTarget,
|
|
buildGridSnapEdges,
|
|
resolveSnapAdjustment,
|
|
resolveEquidistanceGuides,
|
|
resolveGuideLineRect,
|
|
SNAP_THRESHOLD_PX,
|
|
type SnapTarget,
|
|
} from "./snapEngine";
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Helpers
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function rect(left: number, top: number, width: number, height: number) {
|
|
return { left, top, width, height };
|
|
}
|
|
|
|
function target(id: string, left: number, top: number, width: number, height: number): SnapTarget {
|
|
return {
|
|
left,
|
|
top,
|
|
right: left + width,
|
|
bottom: top + height,
|
|
centerX: left + width / 2,
|
|
centerY: top + height / 2,
|
|
id,
|
|
};
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// extractSnapTargets
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe("extractSnapTargets", () => {
|
|
test("computes right, bottom, centerX, centerY", () => {
|
|
const [t] = extractSnapTargets([{ rect: rect(10, 20, 100, 50), id: "a" }]);
|
|
expect(t.left).toBe(10);
|
|
expect(t.top).toBe(20);
|
|
expect(t.right).toBe(110);
|
|
expect(t.bottom).toBe(70);
|
|
expect(t.centerX).toBe(60);
|
|
expect(t.centerY).toBe(45);
|
|
expect(t.id).toBe("a");
|
|
});
|
|
|
|
test("handles multiple rects", () => {
|
|
const targets = extractSnapTargets([
|
|
{ rect: rect(0, 0, 10, 10), id: "x" },
|
|
{ rect: rect(50, 50, 20, 30), id: "y" },
|
|
]);
|
|
expect(targets).toHaveLength(2);
|
|
expect(targets[1].right).toBe(70);
|
|
expect(targets[1].bottom).toBe(80);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// buildCompositionSnapTarget
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe("buildCompositionSnapTarget", () => {
|
|
test("has id 'composition' and correct edges", () => {
|
|
const t = buildCompositionSnapTarget(rect(0, 0, 1920, 1080));
|
|
expect(t.id).toBe("composition");
|
|
expect(t.left).toBe(0);
|
|
expect(t.right).toBe(1920);
|
|
expect(t.centerX).toBe(960);
|
|
expect(t.centerY).toBe(540);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// buildGridSnapEdges
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe("buildGridSnapEdges", () => {
|
|
test("generates correct grid lines", () => {
|
|
const { x, y } = buildGridSnapEdges(rect(0, 0, 300, 200), 100, 1);
|
|
// At scale=1, step=100: x lines at 100, 200 (not 0 or 300)
|
|
expect(x.map((e) => e.position)).toEqual([100, 200]);
|
|
expect(y.map((e) => e.position)).toEqual([100]);
|
|
expect(x[0].source).toBe("grid");
|
|
});
|
|
|
|
test("applies scale to grid spacing", () => {
|
|
const { x } = buildGridSnapEdges(rect(0, 0, 600, 100), 100, 2);
|
|
// step = 200, lines at 200, 400
|
|
expect(x.map((e) => e.position)).toEqual([200, 400]);
|
|
});
|
|
|
|
test("handles offset composition rect", () => {
|
|
const { x } = buildGridSnapEdges(rect(50, 0, 300, 100), 100, 1);
|
|
// Lines at 150, 250 (offset + step, offset + 2*step)
|
|
expect(x.map((e) => e.position)).toEqual([150, 250]);
|
|
});
|
|
|
|
test("returns empty for zero gridSpacing", () => {
|
|
const { x, y } = buildGridSnapEdges(rect(0, 0, 300, 200), 0, 1);
|
|
expect(x).toHaveLength(0);
|
|
expect(y).toHaveLength(0);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// resolveSnapAdjustment — edge alignment
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe("resolveSnapAdjustment", () => {
|
|
const compositionTarget = target("composition", 0, 0, 1000, 800);
|
|
|
|
test("left-to-right alignment: moving left snaps to target right", () => {
|
|
// Target at x=200, width=100 => right edge at 300
|
|
// Moving rect at x=0, width=50. Propose dx=297 => proposed left=297
|
|
// Should snap left=300 (delta +3)
|
|
const t = target("a", 200, 100, 100, 100);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 100, 50, 50),
|
|
proposedDx: 297,
|
|
proposedDy: 0,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(300);
|
|
expect(result.guides.length).toBeGreaterThanOrEqual(1);
|
|
expect(result.guides[0].axis).toBe("x");
|
|
expect(result.guides[0].position).toBe(300);
|
|
});
|
|
|
|
test("right-to-left alignment: moving right snaps to target left", () => {
|
|
// Target at x=200. Moving rect width=50, at x=0.
|
|
// Proposed dx=146 => proposed right = 196. Target left=200. diff=4 within threshold.
|
|
const t = target("a", 200, 100, 100, 100);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 100, 50, 50),
|
|
proposedDx: 146,
|
|
proposedDy: 0,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
// Proposed right = 196, target left = 200, adjustment = +4
|
|
expect(result.dx).toBe(150);
|
|
});
|
|
|
|
test("center-to-center alignment on X axis", () => {
|
|
// Target center at x=250. Moving rect width=100 at x=0 => center at 50.
|
|
// Propose dx=198 => proposed center=248, target center=250, diff=2
|
|
const t = target("a", 200, 100, 100, 100);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 100, 100, 50),
|
|
proposedDx: 198,
|
|
proposedDy: 0,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(200);
|
|
});
|
|
|
|
test("top-to-bottom alignment", () => {
|
|
// Target bottom at 200. Moving top proposed at 197. Should snap to 200.
|
|
const t = target("a", 100, 100, 100, 100);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(100, 0, 50, 50),
|
|
proposedDx: 0,
|
|
proposedDy: 197,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dy).toBe(200);
|
|
});
|
|
|
|
test("center-to-center alignment on Y axis", () => {
|
|
// Target centerY = 150. Moving height=100 at y=0 => center=50.
|
|
// Propose dy=98 => proposed center=148, target center=150, diff=2
|
|
const t = target("a", 100, 100, 100, 100);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(100, 0, 100, 100),
|
|
proposedDx: 0,
|
|
proposedDy: 98,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dy).toBe(100);
|
|
});
|
|
|
|
test("composition center snap", () => {
|
|
// Composition center at 500, 400. Moving rect 100x100 at 0,0 => center 50,50.
|
|
// Propose dx=447, dy=347 => proposed center 497,397. Should snap to 500,400.
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 100, 100),
|
|
proposedDx: 447,
|
|
proposedDy: 347,
|
|
targets: [compositionTarget],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(450);
|
|
expect(result.dy).toBe(350);
|
|
});
|
|
|
|
test("no snap when outside threshold", () => {
|
|
const t = target("a", 200, 200, 100, 100);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 50, 50),
|
|
proposedDx: 10,
|
|
proposedDy: 10,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
// Moving rect edges: left=10, center=35, right=60
|
|
// Target edges: left=200, center=250, right=300
|
|
// All distances > 6
|
|
expect(result.dx).toBe(10);
|
|
expect(result.dy).toBe(10);
|
|
expect(result.guides).toHaveLength(0);
|
|
});
|
|
|
|
test("multiple matching guides at same distance", () => {
|
|
// Two targets with left edges at 100 — both should produce guides
|
|
const t1 = target("a", 100, 0, 50, 50);
|
|
const t2 = target("b", 100, 200, 50, 50);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 100, 50, 50),
|
|
proposedDx: 97,
|
|
proposedDy: 0,
|
|
targets: [t1, t2],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(100);
|
|
// Should have a guide at x=100
|
|
const xGuides = result.guides.filter((g) => g.axis === "x");
|
|
expect(xGuides.length).toBeGreaterThanOrEqual(1);
|
|
expect(xGuides[0].position).toBe(100);
|
|
// The guide extent should cover both targets and the moving rect
|
|
expect(xGuides[0].from).toBe(0); // t1 top
|
|
expect(xGuides[0].to).toBe(250); // t2 bottom
|
|
});
|
|
|
|
test("disabled=true returns passthrough", () => {
|
|
const t = target("a", 100, 100, 50, 50);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 50, 50),
|
|
proposedDx: 98,
|
|
proposedDy: 98,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: true,
|
|
});
|
|
expect(result.dx).toBe(98);
|
|
expect(result.dy).toBe(98);
|
|
expect(result.guides).toHaveLength(0);
|
|
});
|
|
|
|
test("threshold=0 means no snap", () => {
|
|
const t = target("a", 100, 100, 50, 50);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 50, 50),
|
|
proposedDx: 99,
|
|
proposedDy: 99,
|
|
targets: [t],
|
|
threshold: 0,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(99);
|
|
expect(result.dy).toBe(99);
|
|
expect(result.guides).toHaveLength(0);
|
|
});
|
|
|
|
test("element snap takes priority over grid snap", () => {
|
|
// Element left edge at 100. Grid line at 97.
|
|
// Moving rect proposed left at 98 => dist to element=2, dist to grid=1.
|
|
// Grid is closer but element should win (priority).
|
|
// Actually the spec says element takes priority when both match within threshold.
|
|
// Let's set up: element at 103, grid at 97. Moving proposed left=100.
|
|
// Dist to element=3, dist to grid=3. Element should win.
|
|
const t = target("a", 103, 100, 50, 50);
|
|
const gridEdges = {
|
|
x: [{ position: 97, source: "grid" as const, id: "grid-x-0" }],
|
|
y: [],
|
|
};
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 100, 50, 50),
|
|
proposedDx: 100,
|
|
proposedDy: 0,
|
|
targets: [t],
|
|
gridEdges,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
// Element at 103 wins over grid at 97 (both within threshold, same distance)
|
|
expect(result.dx).toBe(103);
|
|
});
|
|
|
|
test("grid snap used when no element matches", () => {
|
|
const gridEdges = {
|
|
x: [{ position: 100, source: "grid" as const, id: "grid-x-0" }],
|
|
y: [],
|
|
};
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 50, 50),
|
|
proposedDx: 97,
|
|
proposedDy: 10,
|
|
targets: [],
|
|
gridEdges,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(100);
|
|
});
|
|
|
|
test("snaps X and Y independently", () => {
|
|
const t = target("a", 200, 300, 100, 100);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 100, 100),
|
|
proposedDx: 198,
|
|
proposedDy: 500,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
// X should snap (left-to-left, diff=2), Y should not snap (too far)
|
|
expect(result.dx).toBe(200);
|
|
expect(result.dy).toBe(500);
|
|
});
|
|
|
|
test("works correctly with many targets (80)", () => {
|
|
const targets: SnapTarget[] = [];
|
|
for (let i = 0; i < 80; i++) {
|
|
targets.push(target(`el-${i}`, i * 50, i * 30, 40, 20));
|
|
}
|
|
// Moving rect near target el-40: left=2000, top=1200
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 40, 20),
|
|
proposedDx: 1998,
|
|
proposedDy: 1198,
|
|
targets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(2000);
|
|
expect(result.dy).toBe(1200);
|
|
expect(result.guides.length).toBeGreaterThanOrEqual(1);
|
|
});
|
|
|
|
test("opposite-direction tie produces no snap (ambiguous midpoint)", () => {
|
|
const tA = target("a", 100, 100, 10, 10);
|
|
const tB = target("b", 120, 100, 10, 10);
|
|
// Moving rect at x=110, width=10 → left=110, right=120
|
|
// tA.right=110, distance=0; tB.left=120, distance=0 — both exact, opposite pull
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(110, 100, 10, 10),
|
|
proposedDx: 0,
|
|
proposedDy: 0,
|
|
targets: [tA, tB],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(0);
|
|
expect(result.dy).toBe(0);
|
|
});
|
|
|
|
test("handles subpixel positions from non-100% zoom", () => {
|
|
const t = target("a", 200.5, 100.3, 100, 100);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 50, 50),
|
|
proposedDx: 197.8,
|
|
proposedDy: 0,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
// left edge at 197.8, target left at 200.5, diff=2.7 within threshold
|
|
expect(result.dx).toBe(200.5);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// resolveGuideLineRect
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe("resolveGuideLineRect", () => {
|
|
const composition = rect(120, 80, 640, 360); // letterboxed inside the overlay
|
|
|
|
test("vertical guide (axis x) spans the composition's height at the snap x", () => {
|
|
expect(resolveGuideLineRect({ axis: "x", position: 440, from: 0, to: 0 }, composition)).toEqual(
|
|
{ left: 440, top: 80, width: 1, height: 360 },
|
|
);
|
|
});
|
|
|
|
test("horizontal guide (axis y) spans the composition's width at the snap y", () => {
|
|
expect(resolveGuideLineRect({ axis: "y", position: 260, from: 0, to: 0 }, composition)).toEqual(
|
|
{ left: 120, top: 260, width: 640, height: 1 },
|
|
);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// resolveEquidistanceGuides
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe("resolveEquidistanceGuides", () => {
|
|
test("detects equal horizontal spacing", () => {
|
|
// Three elements in a row: A(0..40), moving(70..110), B(140..180)
|
|
// Gap A-moving = 70 - 40 = 30, gap moving-B = 140 - 110 = 30 => equal
|
|
const targets = [target("a", 0, 0, 40, 40), target("b", 140, 0, 40, 40)];
|
|
const guides = resolveEquidistanceGuides({
|
|
movingRect: rect(70, 0, 40, 40),
|
|
targets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
});
|
|
const xGuides = guides.filter((g) => g.axis === "x");
|
|
expect(xGuides.length).toBe(2);
|
|
expect(xGuides[0].size).toBe(30);
|
|
expect(xGuides[1].size).toBe(30);
|
|
});
|
|
|
|
test("detects equal vertical spacing", () => {
|
|
// A(y=0..40), moving(y=60..100), B(y=120..160)
|
|
// Gap = 20 each
|
|
const targets = [target("a", 0, 0, 40, 40), target("b", 0, 120, 40, 40)];
|
|
const guides = resolveEquidistanceGuides({
|
|
movingRect: rect(0, 60, 40, 40),
|
|
targets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
});
|
|
const yGuides = guides.filter((g) => g.axis === "y");
|
|
expect(yGuides.length).toBe(2);
|
|
expect(yGuides[0].size).toBe(20);
|
|
});
|
|
|
|
test("no equidistance when gaps differ", () => {
|
|
// A(0..40), moving(80..120), B(200..240)
|
|
// Gap A-moving = 40, gap moving-B = 80 => not equal
|
|
const targets = [target("a", 0, 0, 40, 40), target("b", 200, 0, 40, 40)];
|
|
const guides = resolveEquidistanceGuides({
|
|
movingRect: rect(80, 0, 40, 40),
|
|
targets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
});
|
|
const xGuides = guides.filter((g) => g.axis === "x");
|
|
expect(xGuides.length).toBe(0);
|
|
});
|
|
|
|
test("handles tolerance of 1px", () => {
|
|
// A(0..40), moving(70..110), B(139..179)
|
|
// Gap A-moving = 30, gap moving-B = 29 => difference = 1 => within tolerance
|
|
const targets = [target("a", 0, 0, 40, 40), target("b", 139, 0, 40, 40)];
|
|
const guides = resolveEquidistanceGuides({
|
|
movingRect: rect(70, 0, 40, 40),
|
|
targets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
});
|
|
const xGuides = guides.filter((g) => g.axis === "x");
|
|
expect(xGuides.length).toBe(2);
|
|
});
|
|
|
|
test("ignores overlapping elements", () => {
|
|
// A(0..100), moving(50..150), B(200..300) — A and moving overlap
|
|
const targets = [target("a", 0, 0, 100, 40), target("b", 200, 0, 100, 40)];
|
|
const guides = resolveEquidistanceGuides({
|
|
movingRect: rect(50, 0, 100, 40),
|
|
targets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
});
|
|
const xGuides = guides.filter((g) => g.axis === "x");
|
|
// Gap A-moving = 50 - 100 = -50 (overlap), should be skipped
|
|
expect(xGuides.length).toBe(0);
|
|
});
|
|
|
|
test("only reports triplets involving the moving rect", () => {
|
|
// A(0..40), B(60..100), C(120..160) — all gaps = 20 but none involves moving
|
|
// Moving rect is far away at (500..540)
|
|
const targets = [
|
|
target("a", 0, 0, 40, 40),
|
|
target("b", 60, 0, 40, 40),
|
|
target("c", 120, 0, 40, 40),
|
|
];
|
|
const guides = resolveEquidistanceGuides({
|
|
movingRect: rect(500, 0, 40, 40),
|
|
targets,
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
});
|
|
// The A-B-C triplet doesn't involve moving, so no guides from it
|
|
// Any triplet involving moving would have huge gaps that don't match
|
|
const xGuides = guides.filter((g) => g.axis === "x");
|
|
expect(xGuides.length).toBe(0);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Edge cases
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe("edge cases", () => {
|
|
test("empty targets returns passthrough", () => {
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 50, 50),
|
|
proposedDx: 10,
|
|
proposedDy: 20,
|
|
targets: [],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(10);
|
|
expect(result.dy).toBe(20);
|
|
expect(result.guides).toHaveLength(0);
|
|
});
|
|
|
|
test("exact match (zero distance) produces snap", () => {
|
|
const t = target("a", 100, 100, 50, 50);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 50, 50),
|
|
proposedDx: 100,
|
|
proposedDy: 100,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(100);
|
|
expect(result.dy).toBe(100);
|
|
expect(result.guides.length).toBeGreaterThanOrEqual(1);
|
|
});
|
|
|
|
test("negative proposed delta works", () => {
|
|
const t = target("a", 50, 50, 100, 100);
|
|
// Moving rect at (200, 200), propose dx=-148 => proposed left=52, target left=50, diff=2
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(200, 200, 50, 50),
|
|
proposedDx: -148,
|
|
proposedDy: -148,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(-150);
|
|
expect(result.dy).toBe(-150);
|
|
});
|
|
|
|
test("left-to-left alignment", () => {
|
|
const t = target("a", 100, 0, 200, 200);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 300, 80, 80),
|
|
proposedDx: 97,
|
|
proposedDy: 0,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(100);
|
|
});
|
|
|
|
test("right-to-right alignment", () => {
|
|
// Target right = 300. Moving rect width=80 at x=0, right=80.
|
|
// Propose dx=217 => proposed right=297, target right=300, diff=3.
|
|
const t = target("a", 100, 0, 200, 200);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 300, 80, 80),
|
|
proposedDx: 217,
|
|
proposedDy: 0,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dx).toBe(220); // proposed left=220, proposed right=300
|
|
});
|
|
|
|
test("bottom-to-bottom alignment", () => {
|
|
// Target bottom = 200. Moving rect height=50 at y=0, bottom=50.
|
|
// Propose dy=147 => proposed bottom=197, target bottom=200, diff=3.
|
|
const t = target("a", 0, 0, 200, 200);
|
|
const result = resolveSnapAdjustment({
|
|
movingRect: rect(0, 0, 50, 50),
|
|
proposedDx: 0,
|
|
proposedDy: 147,
|
|
targets: [t],
|
|
threshold: SNAP_THRESHOLD_PX,
|
|
disabled: false,
|
|
});
|
|
expect(result.dy).toBe(150);
|
|
});
|
|
});
|