@hyperframes/studio 0.6.28 → 0.6.30

package/src/hooks/useRenderClipContent.test.ts

@@ -0,0 +1,50 @@
+import { describe, expect, it } from "vitest";
+import { normalizeCompositionSrc } from "./useRenderClipContent";
+
+describe("normalizeCompositionSrc", () => {
+  const origin = "http://localhost:5190";
+  const pid = "my-project";
+
+  it("strips absolute preview URL to relative path", () => {
+    const result = normalizeCompositionSrc(
+      "http://localhost:5190/api/projects/my-project/preview/compositions/intro.html",
+      pid,
+      origin,
+    );
+    expect(result).toBe("compositions/intro.html");
+  });
+
+  it("preserves already-relative paths", () => {
+    const result = normalizeCompositionSrc("compositions/intro.html", pid, origin);
+    expect(result).toBe("compositions/intro.html");
+  });
+
+  it("preserves absolute URLs from different origins", () => {
+    const result = normalizeCompositionSrc(
+      "https://cdn.example.com/compositions/intro.html",
+      pid,
+      origin,
+    );
+    expect(result).toBe("https://cdn.example.com/compositions/intro.html");
+  });
+
+  it("preserves absolute URLs for different projects", () => {
+    const result = normalizeCompositionSrc(
+      "http://localhost:5190/api/projects/other-project/preview/compositions/intro.html",
+      pid,
+      origin,
+    );
+    expect(result).toBe(
+      "http://localhost:5190/api/projects/other-project/preview/compositions/intro.html",
+    );
+  });
+
+  it("handles nested composition paths", () => {
+    const result = normalizeCompositionSrc(
+      "http://localhost:5190/api/projects/my-project/preview/compositions/scenes/hero.html",
+      pid,
+      origin,
+    );
+    expect(result).toBe("compositions/scenes/hero.html");
+  });
+});

package/src/hooks/useRenderClipContent.ts

@@ -5,6 +5,23 @@ import type { TimelineElement } from "../player";
 import { AudioWaveform } from "../player/components/AudioWaveform";
 import { getTimelineElementLabel } from "../utils/studioHelpers";
 
+export function normalizeCompositionSrc(
+  compSrc: string,
+  projectId: string,
+  origin: string,
+): string {
+  try {
+    const parsed = new URL(compSrc, origin);
+    const previewPrefix = `/api/projects/${projectId}/preview/`;
+    if (parsed.pathname.startsWith(previewPrefix)) {
+      return parsed.pathname.slice(previewPrefix.length);
+    }
+  } catch {
+    // already relative
+  }
+  return compSrc;
+}
+
 interface UseRenderClipContentOptions {
   projectIdRef: { current: string | null };
   compIdToSrc: Map<string, string>;
@@ -23,8 +40,10 @@ export function useRenderClipContent({
       const pid = projectIdRef.current;
       if (!pid) return null;
 
-      // Resolve composition source path using the compIdToSrc map
       let compSrc = el.compositionSrc;
+      if (compSrc) {
+        compSrc = normalizeCompositionSrc(compSrc, pid, window.location.origin);
+      }
       if (compSrc && compIdToSrc.size > 0) {
         const resolved =
           compIdToSrc.get(el.id) ||
@@ -40,7 +59,7 @@ export function useRenderClipContent({
           previewUrl: `/api/projects/${pid}/preview/comp/${compSrc}`,
           label: getTimelineElementLabel(el),
           labelColor: style.label,
-          accentColor: style.clip,
+
           seekTime: 0,
           duration: el.duration,
         });
@@ -53,7 +72,7 @@ export function useRenderClipContent({
           previewUrl: activePreviewUrl,
           label: getTimelineElementLabel(el),
           labelColor: style.label,
-          accentColor: style.clip,
+
           selector: el.selector,
           selectorIndex: el.selectorIndex,
           seekTime: el.start,
@@ -109,7 +128,7 @@ export function useRenderClipContent({
           previewUrl: `/api/projects/${pid}/preview`,
           label: getTimelineElementLabel(el),
           labelColor: style.label,
-          accentColor: style.clip,
+
           selector: el.selector,
           selectorIndex: el.selectorIndex,
           seekTime: el.start,

package/src/hooks/useServerConnection.ts

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { buildProjectHash, parseProjectIdFromHash } from "../utils/projectRouting";
 import { useMountEffect } from "./useMountEffect";
 
@@ -67,5 +67,15 @@ export function useServerConnection(): ServerConnectionState {
     };
   });
 
+  // eslint-disable-next-line no-restricted-syntax
+  useEffect(() => {
+    const onHashChange = () => {
+      const next = parseProjectIdFromHash(window.location.hash);
+      if (next && next !== projectId) setProjectId(next);
+    };
+    window.addEventListener("hashchange", onHashChange);
+    return () => window.removeEventListener("hashchange", onHashChange);
+  }, [projectId]);
+
   return { projectId, resolving, waitingForServer };
 }

package/src/main.tsx

@@ -1,10 +1,31 @@
 import { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import { StudioApp } from "./App";
+import { StudioErrorBoundary } from "./components/StudioErrorBoundary";
+import { trackStudioEvent } from "./utils/studioTelemetry";
 import "./styles/studio.css";
 
+trackStudioEvent("session_start");
+
+window.addEventListener("error", (event) => {
+  trackStudioEvent("unhandled_error", {
+    error_message: event.message,
+    filename: event.filename ?? null,
+    lineno: event.lineno ?? null,
+    colno: event.colno ?? null,
+  });
+});
+
+window.addEventListener("unhandledrejection", (event) => {
+  trackStudioEvent("unhandled_promise_rejection", {
+    error_message: event.reason instanceof Error ? event.reason.message : String(event.reason),
+  });
+});
+
 createRoot(document.getElementById("root")!).render(
   <StrictMode>
-    <StudioApp />
+    <StudioErrorBoundary>
+      <StudioApp />
+    </StudioErrorBoundary>
   </StrictMode>,
 );

package/src/player/components/CompositionThumbnail.tsx

@@ -5,7 +5,6 @@ interface CompositionThumbnailProps {
   previewUrl: string;
   label: string;
   labelColor: string;
-  accentColor?: string;
   selector?: string;
   selectorIndex?: number;
   seekTime?: number;
@@ -16,7 +15,6 @@ interface CompositionThumbnailProps {
 
 const CLIP_HEIGHT = 66;
 const THUMBNAIL_URL_VERSION = "v3";
-const COMPOSITION_THUMBNAIL_LABEL_Z_INDEX = 10;
 
 export function buildCompositionThumbnailUrl({
   previewUrl,
@@ -53,7 +51,6 @@ export const CompositionThumbnail = memo(function CompositionThumbnail({
   previewUrl,
   label,
   labelColor,
-  accentColor = "#6B7280",
   selector,
   selectorIndex,
   seekTime = 2,
@@ -110,8 +107,11 @@ export const CompositionThumbnail = memo(function CompositionThumbnail({
         className="hidden"
       />
 
-      {loaded ? (
-        <div className="absolute inset-0 flex">
+      {loaded && (
+        <div
+          className="absolute inset-0 flex"
+          style={{ animation: "hf-thumb-fade 200ms ease-out", mixBlendMode: "lighten" }}
+        >
           {Array.from({ length: frameCount }).map((_, i) => (
             <div
               key={i}
@@ -122,59 +122,25 @@ export const CompositionThumbnail = memo(function CompositionThumbnail({
                 src={url}
                 alt=""
                 draggable={false}
-                className="absolute inset-0 h-full w-full object-cover opacity-60"
+                className="absolute inset-0 h-full w-full object-cover"
+                style={{ opacity: 0.7 }}
               />
             </div>
           ))}
         </div>
-      ) : (
-        <div
-          className="absolute inset-0 animate-pulse"
-          style={{
-            background:
-              "linear-gradient(90deg, rgba(255,255,255,0.02) 0%, rgba(255,255,255,0.05) 50%, rgba(255,255,255,0.02) 100%)",
-          }}
-        />
       )}
 
-      <div
-        className="absolute inset-0"
-        style={{
-          background: `linear-gradient(120deg, ${accentColor}2e, transparent 34%), linear-gradient(180deg, rgba(255,255,255,0.02), rgba(0,0,0,0.08))`,
-        }}
-      />
-
-      <div
-        className="absolute left-2 top-2"
-        style={{ zIndex: COMPOSITION_THUMBNAIL_LABEL_Z_INDEX }}
-      >
+      <div className="absolute left-3 top-0 bottom-0 flex items-center" style={{ zIndex: 10 }}>
         <span
-          className="block max-w-full truncate rounded-md px-1.5 py-0.5 text-[9px] font-semibold uppercase leading-none"
+          className="block max-w-full truncate text-[10px] font-semibold leading-none"
           style={{
             color: labelColor,
-            background: `${accentColor}2e`,
-            boxShadow: `inset 0 0 0 1px ${accentColor}40`,
+            textShadow: loaded ? "0 1px 4px rgba(0,0,0,0.9), 0 0 8px rgba(0,0,0,0.6)" : "none",
           }}
         >
           {label}
         </span>
       </div>
-
-      <div
-        className="absolute bottom-0 left-0 right-0 px-1.5 pb-0.5 pt-3"
-        style={{
-          zIndex: COMPOSITION_THUMBNAIL_LABEL_Z_INDEX,
-          background:
-            "linear-gradient(to top, rgba(0,0,0,0.85) 0%, rgba(0,0,0,0.4) 60%, transparent 100%)",
-        }}
-      >
-        <span
-          className="block truncate text-[9px] font-semibold leading-tight"
-          style={{ color: labelColor, textShadow: "0 1px 2px rgba(0,0,0,0.9)" }}
-        >
-          {label}
-        </span>
-      </div>
     </div>
   );
 });

package/src/player/components/PlayerControls.tsx

@@ -3,6 +3,7 @@ import { useMountEffect } from "../../hooks/useMountEffect";
 import { formatFrameTime, frameToSeconds, stepFrameTime, formatTime } from "../lib/time";
 import { shouldMutePreviewAudio } from "../lib/timelineIframeHelpers";
 import { usePlayerStore, liveTime } from "../store/playerStore";
+import { trackStudioEvent } from "../../utils/studioTelemetry";
 
 const SPEED_OPTIONS = [0.25, 0.5, 1, 1.5, 2] as const;
 const SEEK_EDGE_SNAP_PX = 8;
@@ -15,6 +16,8 @@ const SHORTCUT_SECTIONS = [
       { key: "J", label: "Play backward" },
       { key: "K", label: "Stop" },
       { key: "L", label: "Play forward" },
+      { key: "M", label: "Toggle mute" },
+      { key: "⇧L", label: "Toggle loop" },
       { key: "←/→", label: "Step 1 frame" },
       { key: "⇧←/⇧→", label: "Step 10 frames" },
     ],
@@ -335,7 +338,10 @@ export const PlayerControls = memo(function PlayerControls({
       <button
         type="button"
         aria-label={isPlaying ? "Pause" : "Play"}
-        onClick={onTogglePlay}
+        onClick={() => {
+          trackStudioEvent("playback", { action: isPlaying ? "pause" : "play" });
+          onTogglePlay();
+        }}
         disabled={controlsDisabled}
         className="flex-shrink-0 w-8 h-8 flex items-center justify-center rounded-lg disabled:opacity-30 disabled:pointer-events-none transition-colors"
         style={{ background: "rgba(255,255,255,0.06)" }}
@@ -461,7 +467,10 @@ export const PlayerControls = memo(function PlayerControls({
       <button
         type="button"
         onClick={() => {
-          if (!audioAutoMuted) setAudioMuted(!audioMuted);
+          if (!audioAutoMuted) {
+            trackStudioEvent("playback", { action: "mute_toggle", muted: !audioMuted });
+            setAudioMuted(!audioMuted);
+          }
         }}
         disabled={controlsDisabled || audioAutoMuted}
         title={muteButtonLabel}
@@ -528,6 +537,7 @@ export const PlayerControls = memo(function PlayerControls({
               <button
                 key={rate}
                 onClick={() => {
+                  trackStudioEvent("playback", { action: "speed_change", rate });
                   setPlaybackRate(rate);
                   setShowSpeedMenu(false);
                 }}
@@ -553,7 +563,10 @@ export const PlayerControls = memo(function PlayerControls({
 
       <button
         type="button"
-        onClick={() => setLoopEnabled(!loopEnabled)}
+        onClick={() => {
+          trackStudioEvent("playback", { action: "loop_toggle", enabled: !loopEnabled });
+          setLoopEnabled(!loopEnabled);
+        }}
         disabled={disabled}
         className={`h-7 w-7 flex items-center justify-center rounded-md border transition-colors ${
           loopEnabled

package/src/player/components/TimelineCanvas.tsx

@@ -10,7 +10,6 @@ import { getRenderedTimelineElement, type TimelineTheme } from "./timelineTheme"
 import { GUTTER, TRACK_H, RULER_H, CLIP_Y, CLIP_HANDLE_W } from "./timelineLayout";
 import type { TimelineElement } from "../store/playerStore";
 import type { DraggedClipState, ResizingClipState, BlockedClipState } from "./useTimelineClipDrag";
-import { formatTime } from "../lib/time";
 import type { TrackVisualStyle } from "./timelineIcons";
 
 interface TimelineCanvasProps {
@@ -134,28 +133,16 @@ export const TimelineCanvas = memo(function TimelineCanvas({
         className={
           renderClipContent
             ? "absolute inset-0 overflow-hidden"
-            : "flex flex-col justify-center overflow-hidden flex-1 min-w-0 px-6"
+            : "flex items-center overflow-hidden flex-1 min-w-0 px-3 gap-2"
         }
       >
         {renderClipContent?.(element, clipStyle) ?? (
-          <div className="flex h-full min-h-0 flex-col justify-between py-3">
-            <span
-              className="max-w-full truncate rounded-md px-1.5 py-0.5 text-[10px] font-semibold uppercase tracking-[0.08em] leading-none"
-              style={{
-                color: clipStyle.label,
-                background: `${clipStyle.accent}26`,
-                boxShadow: `inset 0 0 0 1px ${clipStyle.accent}33`,
-              }}
-            >
-              {element.tag}
-            </span>
-            <span
-              className="max-w-full truncate rounded-md px-1.5 py-0.5 text-[10px] font-medium tabular-nums leading-none"
-              style={{ color: theme.textSecondary, background: "rgba(255,255,255,0.04)" }}
-            >
-              {formatTime(element.start)} {"→"} {formatTime(element.start + element.duration)}
-            </span>
-          </div>
+          <span
+            className="truncate text-[10px] font-medium leading-none"
+            style={{ color: clipStyle.label }}
+          >
+            {element.label || element.id || element.tag}
+          </span>
         )}
       </div>
     </>
@@ -221,10 +208,9 @@ export const TimelineCanvas = memo(function TimelineCanvas({
                     paddingLeft: 16,
                     color: ts.label,
                     fontSize: 11,
-                    letterSpacing: "0.08em",
+                    letterSpacing: "0.06em",
                     textTransform: "uppercase",
-                    background: `linear-gradient(90deg, ${ts.accent}14, transparent 28%)`,
-                    boxShadow: `inset 0 0 0 1px ${ts.accent}24`,
+                    opacity: 0.5,
                   }}
                 >
                   New track

package/src/player/components/TimelineClip.tsx

@@ -51,14 +51,14 @@ export const TimelineClip = memo(function TimelineClip({
   const handleOpacity = getClipHandleOpacity({ isHovered, isSelected, isDragging });
 
   const borderColor = isSelected
-    ? theme.clipBorderActive
+    ? trackStyle.accent + "60"
     : isHovered
       ? theme.clipBorderHover
       : theme.clipBorder;
   const boxShadow = isDragging
     ? theme.clipShadowDragging
     : isSelected
-      ? theme.clipShadowActive
+      ? `0 0 0 1px ${trackStyle.accent}40`
       : isHovered
         ? theme.clipShadowHover
         : theme.clipShadow;
@@ -77,20 +77,14 @@ export const TimelineClip = memo(function TimelineClip({
         top: clipY,
         bottom: clipY,
         borderRadius: theme.clipRadius,
-        background: isSelected
-          ? `linear-gradient(180deg, rgba(255,255,255,0.03), rgba(255,255,255,0)), linear-gradient(120deg, ${trackStyle.accent}22, transparent 28%), ${theme.clipBackgroundActive}`
-          : `linear-gradient(180deg, rgba(255,255,255,0.02), rgba(255,255,255,0)), linear-gradient(120deg, ${trackStyle.accent}1e, transparent 28%), ${theme.clipBackground}`,
-        backgroundImage:
-          isComposition && !hasCustomContent
-            ? `repeating-linear-gradient(135deg, transparent, transparent 3px, rgba(255,255,255,0.05) 3px, rgba(255,255,255,0.05) 6px)`
-            : undefined,
+        background: trackStyle.clip,
         border: `1px solid ${borderColor}`,
         boxShadow,
-        transition:
-          "border-color 120ms ease-out, box-shadow 140ms ease-out, background 140ms ease-out",
+        transition: "border-color 100ms, box-shadow 100ms",
         zIndex: isDragging ? 20 : isSelected ? 10 : isHovered ? 5 : 1,
         cursor: capabilities.canMove ? "grab" : "default",
         transform: isDragging ? "translateY(-1px)" : undefined,
+        opacity: isDragging ? 0.92 : 1,
       }}
       title={
         isComposition
@@ -103,78 +97,80 @@ export const TimelineClip = memo(function TimelineClip({
       onClick={onClick}
       onDoubleClick={onDoubleClick}
     >
+      {/* Left accent stripe */}
       <div
         aria-hidden="true"
-        role="presentation"
-        onPointerDown={(e) => onResizeStart?.("start", e)}
         style={{
           position: "absolute",
           left: 0,
           top: 0,
           bottom: 0,
-          width: 18,
-          opacity: showHandles && capabilities.canTrimStart ? 1 : 0,
-          pointerEvents: onResizeStart && capabilities.canTrimStart ? "auto" : "none",
-          zIndex: 4,
-          transition: "opacity 120ms ease-out",
-          cursor: "col-resize",
-          background:
-            showHandles && capabilities.canTrimStart
-              ? `linear-gradient(90deg, ${trackStyle.accent}4d 0%, ${trackStyle.accent}22 42%, transparent 100%)`
-              : "transparent",
+          width: 3,
+          background: trackStyle.accent,
+          opacity: isSelected ? 0.7 : 0.3,
+          borderRadius: `${theme.clipRadius} 0 0 ${theme.clipRadius}`,
+          zIndex: 2,
+          pointerEvents: "none",
         }}
-      >
+      />
+      {/* Left trim handle */}
+      {showHandles && capabilities.canTrimStart && (
         <div
+          aria-hidden="true"
+          onPointerDown={(e) => onResizeStart?.("start", e)}
           style={{
             position: "absolute",
-            left: 6,
-            top: 7,
-            bottom: 7,
-            width: 3,
-            borderRadius: 999,
-            background: theme.handleColor,
-            boxShadow: `0 0 0 1px ${trackStyle.accent}38, 0 0 12px ${trackStyle.accent}18`,
-            opacity: handleOpacity,
-            pointerEvents: "none",
+            left: 0,
+            top: 0,
+            bottom: 0,
+            width: 14,
+            cursor: "col-resize",
+            zIndex: 4,
           }}
-        />
-      </div>
-      <div
-        aria-hidden="true"
-        role="presentation"
-        onPointerDown={(e) => onResizeStart?.("end", e)}
-        style={{
-          position: "absolute",
-          right: 0,
-          top: 0,
-          bottom: 0,
-          width: 18,
-          opacity: showHandles && capabilities.canTrimEnd ? 1 : 0,
-          pointerEvents: onResizeStart && capabilities.canTrimEnd ? "auto" : "none",
-          zIndex: 4,
-          transition: "opacity 120ms ease-out",
-          cursor: "col-resize",
-          background:
-            showHandles && capabilities.canTrimEnd
-              ? `linear-gradient(270deg, ${trackStyle.accent}4d 0%, ${trackStyle.accent}22 42%, transparent 100%)`
-              : "transparent",
-        }}
-      >
+        >
+          <div
+            style={{
+              position: "absolute",
+              left: 4,
+              top: 6,
+              bottom: 6,
+              width: 2,
+              borderRadius: 1,
+              background: trackStyle.accent,
+              opacity: handleOpacity * 0.6,
+            }}
+          />
+        </div>
+      )}
+      {/* Right trim handle */}
+      {showHandles && capabilities.canTrimEnd && (
         <div
+          aria-hidden="true"
+          onPointerDown={(e) => onResizeStart?.("end", e)}
           style={{
             position: "absolute",
-            right: 6,
-            top: 7,
-            bottom: 7,
-            width: 3,
-            borderRadius: 999,
-            background: theme.handleColor,
-            boxShadow: `0 0 0 1px ${trackStyle.accent}38, 0 0 12px ${trackStyle.accent}18`,
-            opacity: handleOpacity,
-            pointerEvents: "none",
+            right: 0,
+            top: 0,
+            bottom: 0,
+            width: 14,
+            cursor: "col-resize",
+            zIndex: 4,
           }}
-        />
-      </div>
+        >
+          <div
+            style={{
+              position: "absolute",
+              right: 4,
+              top: 6,
+              bottom: 6,
+              width: 2,
+              borderRadius: 1,
+              background: trackStyle.accent,
+              opacity: handleOpacity * 0.6,
+            }}
+          />
+        </div>
+      )}
       {children}
     </div>
   );

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

@@ -263,6 +263,22 @@ describe("getTimelineEditCapabilities", () => {
     });
   });
 
+  it("locks all timeline edits for clips with data-timeline-locked", () => {
+    expect(
+      getTimelineEditCapabilities({
+        tag: "div",
+        duration: 8,
+        selector: '[data-composition-id="caption-highlight"]',
+        compositionSrc: "compositions/components/caption-highlight.html",
+        timelineLocked: true,
+      }),
+    ).toEqual({
+      canMove: false,
+      canTrimStart: false,
+      canTrimEnd: false,
+    });
+  });
+
   it("allows full editing of explicitly authored generic elements", () => {
     expect(
       getTimelineEditCapabilities({

package/src/player/components/timelineEditing.ts

@@ -211,8 +211,9 @@ export function getTimelineEditCapabilities(input: {
   playbackStartAttr?: "media-start" | "playback-start";
   sourceDuration?: number;
   timingSource?: "authored" | "implicit";
+  timelineLocked?: boolean;
 }): TimelineEditCapabilities {
-  if (input.timingSource === "implicit") {
+  if (input.timingSource === "implicit" || input.timelineLocked) {
     return {
       canMove: false,
       canTrimStart: false,