@hyperframes/studio 0.8.62 → 0.8.63

package/src/player/components/CompositionThumbnail.tsx

@@ -1,4 +1,4 @@
-import { memo, useCallback, useMemo, useRef, useState } from "react";
+import { memo, useCallback, useMemo, useRef, useState, type CSSProperties } from "react";
 import { useMountEffect } from "../../hooks/useMountEffect";
 import { useThumbnailLease } from "../../hooks/useThumbnailLease";
 import { createThumbnailKey, type ThumbnailPriority } from "../lib/thumbnailScheduler";
@@ -153,7 +153,11 @@ export const CompositionThumbnail = memo(function CompositionThumbnail({
       {value && (
         <div
           className="absolute inset-0 flex"
-          style={{ animation: "hf-thumb-fade 200ms ease-out", mixBlendMode: "lighten" }}
+          style={{
+            animation: "hf-thumb-fade 200ms ease-out",
+            mixBlendMode:
+              "var(--timeline-composition-thumbnail-blend)" as CSSProperties["mixBlendMode"],
+          }}
         >
           {Array.from({ length: frameCount }, (_, index) => (
             <div
@@ -166,7 +170,7 @@ export const CompositionThumbnail = memo(function CompositionThumbnail({
                 alt=""
                 draggable={false}
                 className="absolute inset-0 h-full w-full object-cover"
-                style={{ opacity: 0.7 }}
+                style={{ opacity: "var(--timeline-composition-thumbnail-opacity)" }}
               />
             </div>
           ))}

package/src/player/components/ImageThumbnail.tsx

@@ -5,7 +5,7 @@ import { createThumbnailKey, type ThumbnailPriority } from "../lib/thumbnailSche
 import { TIMELINE_VIEWPORT_BUDGETS } from "../lib/timelineViewportBudgets";
 import { computeThumbnailStrip, probeImageAspect } from "./thumbnailUtils";
 
-interface ImageThumbnailProps {
+export interface ImageThumbnailProps {
   imageSrc: string;
   label: string;
   labelColor: string;

package/src/player/components/TimelineClipJoins.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from "vitest";
+import { deriveTimelineClipJoins } from "./TimelineClipJoins";
+import type { TimelineElement } from "../store/playerStore";
+
+const clip = (id: string, start: number, duration: number): TimelineElement => ({
+  id,
+  tag: "video",
+  start,
+  duration,
+  track: 0,
+});
+
+describe("deriveTimelineClipJoins", () => {
+  it("finds joins in time order, whatever order the clips arrive in", () => {
+    expect(
+      deriveTimelineClipJoins([clip("c", 3, 1), clip("a", 0, 1.5), clip("b", 1.5, 1.5)]),
+    ).toEqual([1.5, 3]);
+  });
+
+  it("treats float noise as a join and a one-frame gap or an overlap as none", () => {
+    expect(deriveTimelineClipJoins([clip("a", 0, 0.1 + 0.2), clip("b", 0.3, 1)])).toEqual([
+      0.1 + 0.2,
+    ]);
+    expect(deriveTimelineClipJoins([clip("a", 0, 1), clip("b", 1 + 1 / 60, 1)])).toEqual([]);
+    expect(deriveTimelineClipJoins([clip("a", 0, 1), clip("b", 0.8, 1)])).toEqual([]);
+  });
+});

package/src/player/components/TimelineClipJoins.tsx

@@ -0,0 +1,52 @@
+import { CLIP_Y } from "./timelineLayout";
+import { sortedLaneClips, TRACK_GAP_EPSILON_S } from "./timelineGaps";
+import type { TimelineElement } from "../store/playerStore";
+
+/** Times where one clip on a row ends exactly where the next begins. */
+export function deriveTimelineClipJoins(elements: readonly TimelineElement[]): number[] {
+  const sorted = sortedLaneClips(elements);
+  const joins: number[] = [];
+  for (let index = 1; index < sorted.length; index += 1) {
+    const previous = sorted[index - 1]!;
+    const end = previous.start + previous.duration;
+    if (Math.abs(sorted[index]!.start - end) < TRACK_GAP_EPSILON_S) joins.push(end);
+  }
+  return joins;
+}
+
+interface TimelineClipJoinsProps {
+  elements: readonly TimelineElement[];
+  pixelsPerSecond: number;
+  rowHeight: number;
+  clipBarHeight?: number;
+  color: string;
+}
+
+/** A hairline in the row colour over each join, so touching clips read as two without moving either. */
+export function TimelineClipJoins({
+  elements,
+  pixelsPerSecond,
+  rowHeight,
+  clipBarHeight,
+  color,
+}: TimelineClipJoinsProps) {
+  const height = clipBarHeight ?? rowHeight - 2 * CLIP_Y;
+  return deriveTimelineClipJoins(elements).map((time) => (
+    <div
+      key={time}
+      data-timeline-clip-join=""
+      aria-hidden="true"
+      className="absolute pointer-events-none"
+      style={{
+        left: time * pixelsPerSecond,
+        top: CLIP_Y,
+        width: 1,
+        height,
+        transform: "translateX(-50%)",
+        background: color,
+        // Over an idle or hovered clip, under the diamonds (6) and a selected clip (10).
+        zIndex: 5,
+      }}
+    />
+  ));
+}

package/src/player/components/TimelineLanes.test.tsx

@@ -462,3 +462,38 @@ describe("TimelineLanes clip thumbnails", () => {
     act(() => view.root.unmount());
   });
 });
+
+describe("TimelineLanes clip joins", () => {
+  const at = (id: string, start: number, duration: number): TimelineElement => ({
+    ...element(id, TRACK_A),
+    start,
+    duration,
+  });
+
+  it("draws one row-coloured hairline where clips touch, and leaves the clips where they are", () => {
+    const view = renderLanes({
+      elements: [at("clip-a", 0, 2), at("clip-b", 2, 1.5), at("clip-c", 4, 1)],
+    });
+
+    const joins = view.host.querySelectorAll<HTMLElement>("[data-timeline-clip-join]");
+    expect(joins).toHaveLength(1);
+    expect(joins[0]?.style.left).toBe("200px");
+    expect(joins[0]?.style.width).toBe("1px");
+    expect(joins[0]?.style.background).toBe(defaultTimelineTheme.rowBackground);
+    const clipB = view.host.querySelector<HTMLElement>('[data-el-id="clip-b"]');
+    expect(clipB?.style.left).toBe("200px");
+    expect(clipB?.style.width).toBe("150px");
+    act(() => view.root.unmount());
+  });
+
+  it("draws no join while a clip is being moved, since the moved clip is drawn elsewhere", () => {
+    const clipA = at("clip-a", 0, 2);
+    const view = renderLanes({
+      elements: [clipA, at("clip-b", 2, 1.5)],
+      draggedClip: { element: clipA, started: true } as DraggedClipState,
+    });
+
+    expect(view.host.querySelectorAll("[data-timeline-clip-join]")).toHaveLength(0);
+    act(() => view.root.unmount());
+  });
+});

package/src/player/components/TimelineLanes.tsx

@@ -32,7 +32,6 @@ import { queryTimelineClipIndex } from "../lib/timelineClipIndex";
 import { getTimelineElementIdentity } from "../lib/timelineElementHelpers";
 import { timelineClipFocusId } from "./timelineNavigationIdentity";
 import { useTimelineKeyboardActor } from "./useTimelineKeyboardActor";
-import { deriveTimelineTransitionSeams } from "./timelineTransitionSeams";
 import { TimelineTransitionOverlays } from "./TimelineTransitionOverlays";
 
 export function TimelineLanes({
@@ -224,9 +223,6 @@ export function TimelineLanes({
           // right only while it is collapsed and the row is nothing but bar.
           const clipBarHeight = rowExpanded ? TRACK_H - 2 * CLIP_Y : undefined;
           const automationElements = els.map(getPreviewElement);
-          const transitionSeams = deriveTimelineTransitionSeams(allTransitionElements).filter(
-            (seam) => seam.incoming.track === trackNum,
-          );
           // Minted here because this is the only place that sees BOTH ends of
           // the disclosure: the caret in the sticky header and the diamond lanes
           // on the canvas. Keyed by display row, not by `trackNum`, which is a
@@ -555,7 +551,10 @@ export function TimelineLanes({
                   })
                 }
                 <TimelineTransitionOverlays
-                  seams={transitionSeams}
+                  transitionElements={allTransitionElements}
+                  track={trackNum}
+                  rowElements={draggedClip?.started ? [] : automationElements}
+                  rowBackground={rowBackground}
                   pixelsPerSecond={pps}
                   rowHeight={rowHeight}
                   clipBarHeight={clipBarHeight}

package/src/player/components/TimelineTransitionOverlays.tsx

@@ -1,30 +1,53 @@
 import { CLIP_Y } from "./timelineLayout";
 import { getTimelineElementIdentity } from "../lib/timelineElementHelpers";
-import type { TimelineTransitionSeam } from "./timelineTransitionSeams";
+import type { TimelineElement } from "../store/playerStore";
+import { deriveTimelineTransitionSeams } from "./timelineTransitionSeams";
 import { TimelineTransitionBadge } from "./TimelineTransitionBadge";
+import { TimelineClipJoins } from "./TimelineClipJoins";
 
 interface TimelineTransitionOverlaysProps {
-  seams: readonly TimelineTransitionSeam[];
+  transitionElements: readonly TimelineElement[];
+  track: number;
+  rowElements: readonly TimelineElement[];
+  rowBackground: string;
   pixelsPerSecond: number;
   rowHeight: number;
   clipBarHeight?: number;
 }
 
+/** What a row draws where its clips meet: a hairline at an exact join, a badge over a transition. */
 export function TimelineTransitionOverlays({
-  seams,
+  transitionElements,
+  track,
+  rowElements,
+  rowBackground,
   pixelsPerSecond,
   rowHeight,
   clipBarHeight,
 }: TimelineTransitionOverlaysProps) {
   const top = CLIP_Y + (clipBarHeight ?? rowHeight - 2 * CLIP_Y) / 2;
-  return seams.map((seam) => (
-    <TimelineTransitionBadge
-      key={`${getTimelineElementIdentity(seam.outgoing)}-${getTimelineElementIdentity(seam.incoming)}`}
-      centerPx={seam.centerTime * pixelsPerSecond}
-      top={top}
-      widthPx={Math.min(Math.max(seam.duration * pixelsPerSecond, 24), 32)}
-      outgoingSrc={seam.outgoing.src}
-      incomingSrc={seam.incoming.src}
-    />
-  ));
+  const seams = deriveTimelineTransitionSeams(transitionElements).filter(
+    (seam) => seam.incoming.track === track,
+  );
+  return (
+    <>
+      <TimelineClipJoins
+        elements={rowElements}
+        pixelsPerSecond={pixelsPerSecond}
+        rowHeight={rowHeight}
+        clipBarHeight={clipBarHeight}
+        color={rowBackground}
+      />
+      {seams.map((seam) => (
+        <TimelineTransitionBadge
+          key={`${getTimelineElementIdentity(seam.outgoing)}-${getTimelineElementIdentity(seam.incoming)}`}
+          centerPx={seam.centerTime * pixelsPerSecond}
+          top={top}
+          widthPx={Math.min(Math.max(seam.duration * pixelsPerSecond, 24), 32)}
+          outgoingSrc={seam.outgoing.src}
+          incomingSrc={seam.incoming.src}
+        />
+      ))}
+    </>
+  );
 }

package/src/player/components/timelineDragLanding.ts

@@ -37,15 +37,11 @@ export function layoutAfterTrackInsert(
 } | null {
   const { elements, trackOrder } = deps;
   const editKey = keyOf(element);
-  // Expanded-child rows are synthetic host lanes, not source-file topology.
-  if (element.expandedParentStart != null) return null;
   const targetTrack = insertTrackValue(trackOrder, insertRow);
   // Foreign display rows and the opposite zone must not affect this topology.
   const writableZone = classifyZone(element);
   const writable = (src: TimelineElement): boolean =>
-    sameSourceFile(src, element) &&
-    classifyZone(src) === writableZone &&
-    src.expandedParentStart == null;
+    sameSourceFile(src, element) && classifyZone(src) === writableZone;
   const topologyOrder = [...new Set(elements.filter(writable).map((e) => e.track))].sort(
     (a, b) => a - b,
   );

package/src/player/components/timelineGaps.test.ts

@@ -183,39 +183,9 @@ describe("trackHasGaps", () => {
   });
 });
 
-describe("lane floor (expanded sub-comp children)", () => {
-  const child = (id: string, start: number, duration: number): TimelineElement => ({
-    ...el(id, start, duration),
-    expandedParentStart: 16,
-    sourceFile: "scene.html",
-  });
-
-  it("laneGapFloor is 0 for ordinary lanes and the host window start for child lanes", () => {
+describe("lane floor", () => {
+  it("laneGapFloor is always 0", () => {
     expect(laneGapFloor([el("a", 0, 2)])).toBe(0);
-    expect(laneGapFloor([child("c1", 16.5, 2), child("c2", 20, 2)])).toBe(16);
-  });
-
-  it("compaction lands the first child at the HOST window start, never absolute 0", () => {
-    const lane = [child("c1", 18, 2), child("c2", 22, 2)];
-    expect(resolveAllTrackGaps(lane, undefined, laneGapFloor(lane))).toEqual([
-      { key: "c1", newStart: 16 },
-      { key: "c2", newStart: 18 },
-    ]);
-  });
-
-  it("the leading gap starts at the floor for both close-one and the highlight intervals", () => {
-    const lane = [child("c1", 18, 2)];
-    const floor = laneGapFloor(lane);
-    expect(resolveTrackGapAt(lane, 17, undefined, floor)).toEqual({
-      gapStart: 16,
-      gapEnd: 18,
-      followingKeys: ["c1"],
-    });
-    expect(resolveAllGapIntervals(lane, undefined, floor)).toEqual([{ start: 16, end: 18 }]);
-  });
-
-  it("a child lane contiguous from its host start has no gaps", () => {
-    const lane = [child("c1", 16, 2), child("c2", 18, 2)];
-    expect(trackHasGaps(lane, undefined, laneGapFloor(lane))).toBe(false);
+    expect(laneGapFloor([])).toBe(0);
   });
 });

package/src/player/components/timelineGaps.ts

@@ -17,22 +17,15 @@ export const TRACK_GAP_EPSILON_S = 1e-3;
 
 const keyOf = (e: TimelineElement) => e.key ?? e.id;
 
-/**
- * The lane's time ORIGIN — the earliest start a clip on this lane may take.
- * 0 for ordinary lanes; for a lane of expanded sub-comp children (post-
- * collision-fix a lane is always single-origin) it is the children's host
- * window start (`expandedParentStart`): display times are host-absolute, so
- * compacting toward absolute 0 would drag a child BEFORE its host's window
- * and persist a wrong (even negative) local time.
- */
-export function laneGapFloor(elements: readonly TimelineElement[]): number {
-  return Math.max(0, ...elements.map((e) => e.expandedParentStart ?? 0));
+/** The lane's time ORIGIN — the earliest start a clip on this lane may take. */
+export function laneGapFloor(_elements: readonly TimelineElement[]): number {
+  return 0;
 }
 export const round3 = (v: number) => Math.round(v * 1000) / 1000;
 const endOf = (e: TimelineElement) => e.start + e.duration;
 
 /** Lane clips sorted by start (key as a deterministic tie-break). */
-function sortedLaneClips(elements: readonly TimelineElement[]): TimelineElement[] {
+export function sortedLaneClips(elements: readonly TimelineElement[]): TimelineElement[] {
   return [...elements].sort((a, b) => a.start - b.start || keyOf(a).localeCompare(keyOf(b)));
 }
 

package/src/player/components/timelineZones.test.ts

@@ -67,11 +67,6 @@ describe("isMainTrackElement", () => {
   it("is false for an audio clip even on track 0 (audio-only project has no main track)", () => {
     expect(isMainTrackElement(el("m", "audio", 0))).toBe(false);
   });
-
-  it("is false for an inline-expanded sub-composition child on track 0", () => {
-    const child: TimelineElement = { ...el("c", "video", 0), expandedParentStart: 4 };
-    expect(isMainTrackElement(child)).toBe(false);
-  });
 });
 
 describe("normalizeToZones — CapCut-stable lanes follow the track-index (never z)", () => {

package/src/player/components/timelineZones.ts

@@ -16,10 +16,9 @@ export function classifyZone(el: TimelineElement): TrackZone {
 }
 
 /** The "main track" is a convention, not a schema field: the first
- *  visual-zone display lane, matched only when it actually holds a visual
- *  clip and isn't an inline-expanded sub-composition child. */
+ *  visual-zone display lane, matched only when it actually holds a visual clip. */
 export function isMainTrackElement(el: TimelineElement): boolean {
-  return el.track === 0 && classifyZone(el) === "visual" && el.expandedParentStart == null;
+  return el.track === 0 && classifyZone(el) === "visual";
 }
 
 const keyOf = (el: TimelineElement) => el.key ?? el.id;

package/src/styles/theme.css

@@ -80,6 +80,9 @@
   --timeline-clip-chip-audio-bg: rgba(25, 16, 38, 0.7);
   --timeline-clip-chip-text: #ffffff;
   --timeline-shortcut-bg: rgba(17, 23, 35, 0.84);
+  /* Composition and text clips draw their frame as it is, like video filmstrips; a host may dim them. */
+  --timeline-composition-thumbnail-opacity: 1;
+  --timeline-composition-thumbnail-blend: normal;
   --timeline-thumbnail-shimmer: linear-gradient(
     90deg,
     rgba(255, 255, 255, 0.02) 0%,

package/src/telemetry/events.test.ts

@@ -12,7 +12,6 @@ const {
   trackPreviewFirstFrame,
   trackStudioRenderStart,
   trackStudioRazorSplit,
-  trackStudioExpandedClipEdit,
   trackStudioKeyframeLaneExpand,
   trackStudioSegmentEaseEdit,
   trackStudioFeedback,
@@ -107,11 +106,6 @@ describe("studio telemetry events", () => {
     expect(trackEvent).toHaveBeenCalledWith("studio_razor_split", { mode: "all", count: 3 });
   });
 
-  it("trackStudioExpandedClipEdit emits 'studio_expanded_clip_edit' with action", () => {
-    trackStudioExpandedClipEdit({ action: "resize" });
-    expect(trackEvent).toHaveBeenCalledWith("studio_expanded_clip_edit", { action: "resize" });
-  });
-
   it("trackStudioKeyframeLaneExpand emits 'studio_keyframe_lane_expand' with expanded", () => {
     trackStudioKeyframeLaneExpand({ expanded: true });
     expect(trackEvent).toHaveBeenCalledWith("studio_keyframe_lane_expand", { expanded: true });

package/src/telemetry/events.ts

@@ -84,14 +84,6 @@ export function trackStudioRazorSplit(props: { mode: "single" | "all"; count: nu
   });
 }
 
-// Adoption signal for the inline timeline-expansion surface: edits applied to a
-// sub-composition child clip while its parent scene is expanded.
-export function trackStudioExpandedClipEdit(props: {
-  action: "move" | "resize" | "delete" | "split";
-}): void {
-  trackEvent("studio_expanded_clip_edit", { action: props.action });
-}
-
 // Adoption signal for the per-clip keyframe-lane caret toggle.
 export function trackStudioKeyframeLaneExpand(props: { expanded: boolean }): void {
   trackEvent("studio_keyframe_lane_expand", { expanded: props.expanded });

package/src/components/nle/TimelinePane.test.ts

@@ -1,63 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import type { TimelineElement } from "../../player";
-import {
-  forwardRebasedTimelineMoveElements,
-  forwardRebasedTimelineResizeElements,
-} from "./TimelinePane";
-
-describe("TimelinePane move wrapper", () => {
-  it("rebases expanded edits and forwards track-insert as the third argument", async () => {
-    const onMoveElements = vi.fn().mockResolvedValue(undefined);
-    const element: TimelineElement = {
-      id: "expanded-a",
-      domId: "a",
-      tag: "div",
-      start: 12,
-      duration: 2,
-      track: 0,
-      expandedParentStart: 10,
-    };
-    await forwardRebasedTimelineMoveElements(
-      [{ element, updates: { start: 14, track: 2 } }],
-      "clip-lane-move:7",
-      "track-insert",
-      onMoveElements,
-      Number.POSITIVE_INFINITY,
-    );
-    expect(onMoveElements).toHaveBeenCalledWith(
-      [
-        {
-          element: expect.objectContaining({ id: "a", start: 2 }),
-          updates: { start: 4, track: 2 },
-        },
-      ],
-      "clip-lane-move:7",
-      "track-insert",
-      // The per-gesture coalesce window rides along with the shared key.
-      Number.POSITIVE_INFINITY,
-    );
-  });
-
-  it("forwards one rebased resize batch with the shared gesture key", async () => {
-    const onResizeElements = vi.fn().mockResolvedValue(undefined);
-    const element: TimelineElement = {
-      id: "expanded-a",
-      domId: "a",
-      tag: "div",
-      start: 12,
-      duration: 2,
-      track: 0,
-      expandedParentStart: 10,
-    };
-    await forwardRebasedTimelineResizeElements(
-      [{ element, start: 13, duration: 3 }],
-      { coalesceKey: "clip-group-resize:a:b" },
-      onResizeElements,
-    );
-    expect(onResizeElements).toHaveBeenCalledTimes(1);
-    expect(onResizeElements).toHaveBeenCalledWith(
-      [{ element: expect.objectContaining({ id: "a", start: 2 }), start: 3, duration: 3 }],
-      { coalesceKey: "clip-group-resize:a:b" },
-    );
-  });
-});