@editframe/elements 0.8.0-beta.1 → 0.8.0-beta.3

package/dist/elements/EFMedia.d.ts

@@ -29,6 +29,7 @@ export declare class EFMedia extends EFMedia_base {
     }[] | undefined], Record<string, {
         segment: TrackSegment;
         track: MP4Box.TrackInfo;
+        nextSegment?: TrackSegment;
     }> | undefined>;
     fetchSeekTask: Task<readonly [{
         trackId: string;
@@ -37,6 +38,7 @@ export declare class EFMedia extends EFMedia_base {
     }[] | undefined, Record<string, {
         segment: TrackSegment;
         track: MP4Box.TrackInfo;
+        nextSegment?: TrackSegment;
     }> | undefined, typeof fetch], Record<string, File> | undefined>;
     videoAssetTask: Task<readonly [Record<string, File> | undefined], VideoAsset | undefined>;
     desiredSeekTimeMs: number;
@@ -48,6 +50,7 @@ export declare class EFMedia extends EFMedia_base {
     audioBufferTask: Task<readonly [Record<string, File> | undefined, Record<string, {
         segment: TrackSegment;
         track: MP4Box.TrackInfo;
+        nextSegment?: TrackSegment;
     }> | undefined], {
         buffer: AudioBuffer;
         startOffsetMs: number;

package/dist/elements/EFTemporal.d.ts

@@ -7,11 +7,14 @@ export declare const timegroupContext: {
 };
 export declare class TemporalMixinInterface {
     get hasOwnDuration(): boolean;
+    get trimStartMs(): number;
+    get trimEndMs(): number;
     get durationMs(): number;
     get startTimeMs(): number;
     get startTimeWithinParentMs(): number;
     get endTimeMs(): number;
     get ownCurrentTimeMs(): number;
+    get trimAdjustedOwnCurrentTimeMs(): number;
     set duration(value: string);
     get duration(): string;
     parentTimegroup?: EFTimegroup;

package/dist/elements/EFTimegroup.d.ts

@@ -8,17 +8,15 @@ export declare class EFTimegroup extends EFTimegroup_base {
     static styles: import('lit').CSSResult;
     _timeGroupContext: this;
     mode: "fixed" | "sequence" | "contain";
+    overlapMs: number;
     set currentTime(time: number);
     get currentTime(): number;
     get currentTimeMs(): number;
     set currentTimeMs(ms: number);
-    crossoverMs: number;
     render(): import('lit-html').TemplateResult<1>;
     maybeLoadTimeFromLocalStorage(): number;
     connectedCallback(): void;
     get storageKey(): string;
-    get crossoverStartMs(): number;
-    get crossoverEndMs(): number;
     get durationMs(): number;
     waitForMediaDurations(): Promise<(Record<number, import('packages/assets/dist/Probe.js').TrackFragmentIndex> | undefined)[]>;
     get childTemporals(): import('./EFTemporal.ts').TemporalMixinInterface[];

package/dist/elements/durationConverter.d.ts

@@ -2,3 +2,11 @@ export declare const durationConverter: {
     fromAttribute: (value: string) => number;
     toAttribute: (value: number) => string;
 };
+export declare const trimDurationConverter: {
+    fromAttribute: (value: string) => number;
+    toAttribute: (value: number) => string;
+};
+export declare const imageDurationConverter: {
+    fromAttribute: (value: string) => number;
+    toAttribute: (value: number) => string;
+};

package/dist/elements/src/elements/EFCaptions.js

@@ -120,9 +120,9 @@ let EFCaptions = class extends EFSourceMixin(
     let startMs = 0;
     let endMs = 0;
     for (const segment of caption.segments) {
-      if (this.targetElement.ownCurrentTimeMs >= segment.start * 1e3 && this.targetElement.ownCurrentTimeMs <= segment.end * 1e3) {
+      if (this.targetElement.trimAdjustedOwnCurrentTimeMs >= segment.start * 1e3 && this.targetElement.trimAdjustedOwnCurrentTimeMs <= segment.end * 1e3) {
         for (const word of segment.words) {
-          if (this.targetElement.ownCurrentTimeMs >= word.start * 1e3 && this.targetElement.ownCurrentTimeMs <= word.end * 1e3) {
+          if (this.targetElement.trimAdjustedOwnCurrentTimeMs >= word.start * 1e3 && this.targetElement.trimAdjustedOwnCurrentTimeMs <= word.end * 1e3) {
             words.push(word.text);
             startMs = word.start * 1e3;
             endMs = word.end * 1e3;

package/dist/elements/src/elements/EFMedia.js

@@ -101,10 +101,13 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
           const segment = index.segments.toReversed().find((segment2) => {
             return segment2.dts / track.timescale * 1e3 <= seekToMs;
           });
+          const nextSegment = index.segments.find((segment2) => {
+            return segment2.dts / track.timescale * 1e3 > seekToMs;
+          });
           if (!segment) {
             return;
           }
-          result[index.track] = { segment, track };
+          result[index.track] = { segment, track, nextSegment };
         }
         return result;
       }
@@ -121,13 +124,27 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
           return;
         }
         const files = {};
-        for (const [trackId, { segment, track }] of Object.entries(seekResult)) {
+        for (const [trackId, { segment, track, nextSegment }] of Object.entries(
+          seekResult
+        )) {
           const start = segment.offset;
           const end = segment.offset + segment.size;
           const response = await fetch(this.fragmentTrackPath(trackId), {
             signal,
             headers: { Range: `bytes=${start}-${end}` }
           });
+          if (nextSegment) {
+            const nextStart = nextSegment.offset;
+            const nextEnd = nextSegment.offset + nextSegment.size;
+            fetch(this.fragmentTrackPath(trackId), {
+              signal,
+              headers: { Range: `bytes=${nextStart}-${nextEnd}` }
+            }).then(() => {
+              log("Prefetched next segment");
+            }).catch((error) => {
+              log("Failed to prefetch next segment", error);
+            });
+          }
           const initSegment = Object.values(initSegments).find(
             (initSegment2) => initSegment2.trackId === String(track.id)
           );
@@ -238,7 +255,7 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
   }
   updated(changedProperties) {
     if (changedProperties.has("ownCurrentTimeMs")) {
-      this.executeSeek(this.ownCurrentTimeMs);
+      this.executeSeek(this.trimAdjustedOwnCurrentTimeMs);
     }
   }
   get hasOwnDuration() {
@@ -256,15 +273,15 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
     if (durations.length === 0) {
       return 0;
     }
-    return Math.max(...durations);
+    return Math.max(...durations) - this.trimStartMs - this.trimEndMs;
   }
   get startTimeMs() {
     return getStartTimeMs(this);
   }
   #audioContext;
   async fetchAudioSpanningTime(fromMs, toMs) {
-    fromMs -= this.startTimeMs;
-    toMs -= this.startTimeMs;
+    fromMs -= this.startTimeMs - this.trimStartMs;
+    toMs -= this.startTimeMs - this.trimStartMs;
     await this.trackFragmentIndexLoader.taskComplete;
     const audioTrackId = this.defaultAudioTrackId;
     if (!audioTrackId) {
@@ -284,6 +301,7 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
         headers: { Range: `bytes=${start}-${end}` }
       }
     );
+    console.log({ fromMs, toMs });
     const fragments = Object.values(audioTrackIndex.segments).filter(
       (segment) => {
         const segmentStartsBeforeEnd = segment.dts <= toMs * audioTrackIndex.timescale / 1e3;
@@ -318,8 +336,8 @@ class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
     });
     return {
       blob: audioBlob,
-      startMs: firstFragment.dts / audioTrackIndex.timescale * 1e3,
-      endMs: lastFragment.dts / audioTrackIndex.timescale * 1e3 + lastFragment.duration / audioTrackIndex.timescale * 1e3
+      startMs: firstFragment.dts / audioTrackIndex.timescale * 1e3 - this.trimStartMs,
+      endMs: lastFragment.dts / audioTrackIndex.timescale * 1e3 + lastFragment.duration / audioTrackIndex.timescale * 1e3 - this.trimEndMs
     };
   }
 }

package/dist/elements/src/elements/EFTemporal.js

@@ -85,6 +85,9 @@ const EFTemporal = (superClass) => {
     constructor() {
       super(...arguments);
       this._offsetMs = 0;
+      this._trimStartMs = 0;
+      this._trimEndMs = 0;
+      this._startOffsetMs = 0;
       this.rootTimegroup = this.getRootTimegroup();
       this.frameTask = new Task(this, {
         autoRun: EF_INTERACTIVE,
@@ -112,6 +115,15 @@ const EFTemporal = (superClass) => {
     get parentTimegroup() {
       return this.#parentTimegroup;
     }
+    get trimStartMs() {
+      return this._trimStartMs;
+    }
+    get trimEndMs() {
+      return this._trimEndMs;
+    }
+    get startOffsetMs() {
+      return this._startOffsetMs;
+    }
     getRootTimegroup() {
       let parent = this.tagName === "EF-TIMEGROUP" ? this : this.parentTimegroup;
       while (parent?.parentTimegroup) {
@@ -169,9 +181,9 @@ const EFTemporal = (superClass) => {
           }
           startTimeMsCache.set(
             this,
-            previous.startTimeMs + previous.durationMs
+            previous.startTimeMs + previous.durationMs - parentTimegroup.overlapMs
           );
-          return previous.startTimeMs + previous.durationMs;
+          return previous.startTimeMs + previous.durationMs - parentTimegroup.overlapMs;
         }
         case "contain":
         case "fixed":
@@ -196,6 +208,22 @@ const EFTemporal = (superClass) => {
       }
       return 0;
     }
+    /**
+     * Used to calculate the internal currentTimeMs of the element. This is useful
+     * for mapping to internal media time codes for audio/video elements.
+     */
+    get trimAdjustedOwnCurrentTimeMs() {
+      if (this.rootTimegroup) {
+        return Math.min(
+          Math.max(
+            0,
+            this.rootTimegroup.currentTimeMs - this.startTimeMs + this.trimStartMs
+          ),
+          this.durationMs + Math.abs(this.startOffsetMs) + this.trimStartMs
+        );
+      }
+      return 0;
+    }
   }
   __decorateClass([
     consume({ context: timegroupContext, subscribe: true }),
@@ -215,6 +243,27 @@ const EFTemporal = (superClass) => {
       converter: durationConverter
     })
   ], TemporalMixinClass.prototype, "_durationMs", 2);
+  __decorateClass([
+    property({
+      type: Number,
+      attribute: "trimstart",
+      converter: durationConverter
+    })
+  ], TemporalMixinClass.prototype, "_trimStartMs", 2);
+  __decorateClass([
+    property({
+      type: Number,
+      attribute: "trimend",
+      converter: durationConverter
+    })
+  ], TemporalMixinClass.prototype, "_trimEndMs", 2);
+  __decorateClass([
+    property({
+      type: Number,
+      attribute: "startoffset",
+      converter: durationConverter
+    })
+  ], TemporalMixinClass.prototype, "_startOffsetMs", 2);
   __decorateClass([
     state()
   ], TemporalMixinClass.prototype, "rootTimegroup", 2);

package/dist/elements/src/elements/EFTimegroup.js

@@ -7,6 +7,7 @@ import { EFTemporal, shallowGetTemporalElements, isEFTemporal, timegroupContext
 import { TimegroupController } from "./TimegroupController.js";
 import { EF_INTERACTIVE } from "../EF_INTERACTIVE.js";
 import { deepGetMediaElements } from "./EFMedia.js";
+import { durationConverter } from "./durationConverter.js";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __typeError = (msg) => {
@@ -44,7 +45,7 @@ let EFTimegroup = class extends EFTemporal(LitElement) {
     this._timeGroupContext = this;
     __privateAdd(this, _currentTime, 0);
     this.mode = "sequence";
-    this.crossoverMs = 0;
+    this.overlapMs = 0;
     this.frameTask = new Task(this, {
       autoRun: EF_INTERACTIVE,
       args: () => [this.ownCurrentTimeMs, this.currentTimeMs],
@@ -110,29 +111,18 @@ let EFTimegroup = class extends EFTemporal(LitElement) {
     }
     return `ef-timegroup-${this.id}`;
   }
-  get crossoverStartMs() {
-    const parentTimeGroup = this.parentTimegroup;
-    if (!parentTimeGroup || !this.previousElementSibling) {
-      return 0;
-    }
-    return parentTimeGroup.crossoverMs;
-  }
-  get crossoverEndMs() {
-    const parentTimeGroup = this.parentTimegroup;
-    if (!parentTimeGroup || !this.nextElementSibling) {
-      return 0;
-    }
-    return parentTimeGroup.crossoverMs;
-  }
   get durationMs() {
     switch (this.mode) {
       case "fixed":
         return super.durationMs;
       case "sequence": {
         let duration = 0;
-        for (const node of this.childTemporals) {
+        this.childTemporals.forEach((node, index) => {
+          if (index > 0) {
+            duration -= this.overlapMs;
+          }
           duration += node.durationMs;
-        }
+        });
         return duration;
       }
       case "contain": {
@@ -168,9 +158,14 @@ let EFTimegroup = class extends EFTemporal(LitElement) {
       }
       this.style.display = "";
       const animations = this.getAnimations({ subtree: true });
+      this.style.setProperty("--ef-duration", `${this.durationMs}ms`);
+      this.style.setProperty(
+        "--ef-transition--duration",
+        `${this.parentTimegroup?.overlapMs ?? 0}ms`
+      );
       this.style.setProperty(
-        "--ef-duration",
-        `${this.durationMs + this.crossoverEndMs + this.crossoverStartMs}ms`
+        "--ef-transition-out-start",
+        `${this.durationMs - (this.parentTimegroup?.overlapMs ?? 0)}ms`
       );
       for (const animation of animations) {
         if (animation.playState === "running") {
@@ -311,7 +306,7 @@ EFTimegroup.styles = css`
       display: block;
       width: 100%;
       height: 100%;
-      position: relative;
+      position: absolute;
       top: 0;
     }
   `;
@@ -324,28 +319,16 @@ __decorateClass([
     attribute: "mode"
   })
 ], EFTimegroup.prototype, "mode", 2);
-__decorateClass([
-  property({ type: Number })
-], EFTimegroup.prototype, "currentTime", 1);
 __decorateClass([
   property({
-    attribute: "crossover",
-    converter: {
-      fromAttribute: (value) => {
-        if (value.endsWith("ms")) {
-          return Number.parseFloat(value);
-        }
-        if (value.endsWith("s")) {
-          return Number.parseFloat(value) * 1e3;
-        }
-        throw new Error(
-          "`crossover` MUST be in milliseconds or seconds (10s, 10000ms)"
-        );
-      },
-      toAttribute: (value) => `${value}ms`
-    }
+    type: Number,
+    converter: durationConverter,
+    attribute: "overlap"
   })
-], EFTimegroup.prototype, "crossoverMs", 2);
+], EFTimegroup.prototype, "overlapMs", 2);
+__decorateClass([
+  property({ type: Number })
+], EFTimegroup.prototype, "currentTime", 1);
 EFTimegroup = __decorateClass([
   customElement("ef-timegroup")
 ], EFTimegroup);

package/dist/elements/src/elements/EFWaveform.js

@@ -148,7 +148,7 @@ let EFWaveform = class extends EFTemporal(TWMixin(LitElement)) {
     if (!this.targetElement.audioBufferTask.value) {
       return;
     }
-    if (this.targetElement.ownCurrentTimeMs > 0) {
+    if (this.targetElement.trimAdjustedOwnCurrentTimeMs > 0) {
       const audioContext = new OfflineAudioContext(2, 48e3 / 25, 48e3);
       const audioBufferSource = audioContext.createBufferSource();
       audioBufferSource.buffer = this.targetElement.audioBufferTask.value.buffer;
@@ -159,7 +159,7 @@ let EFWaveform = class extends EFTemporal(TWMixin(LitElement)) {
         0,
         Math.max(
           0,
-          (this.targetElement.ownCurrentTimeMs - this.targetElement.audioBufferTask.value.startOffsetMs) / 1e3
+          (this.targetElement.trimAdjustedOwnCurrentTimeMs - this.targetElement.audioBufferTask.value.startOffsetMs) / 1e3
         ),
         48e3 / 1e3
       );

package/dist/elements/src/elements/parseTimeToMs.js

@@ -1,4 +1,5 @@
 const parseTimeToMs = (time) => {
+  console.log("parseTimeToMs", time);
   if (time.endsWith("ms")) {
     return Number.parseFloat(time);
   }

package/dist/elements/src/gui/ContextMixin.js

@@ -32,25 +32,27 @@ function ContextMixin(superClass) {
           });
         }
         if (this.signingURL) {
-          if (!this.#signedURLs[url]) {
-            this.#signedURLs[url] = fetch(this.signingURL, {
+          if (!this.#URLTokens[url]) {
+            this.#URLTokens[url] = fetch(this.signingURL, {
               method: "POST",
               body: JSON.stringify({ url })
             }).then(async (response) => {
               if (response.ok) {
-                return (await response.json()).url;
+                return (await response.json()).token;
               }
               throw new Error(
                 `Failed to sign URL: ${url}. SigningURL: ${this.signingURL} ${response.status} ${response.statusText}`
               );
             });
           }
-          const signedURL = await this.#signedURLs[url];
-          return fetch(signedURL, init);
+          const urlToken = await this.#URLTokens[url];
+          Object.assign(init.headers, {
+            authorization: `Bearer ${urlToken}`
+          });
         }
         return fetch(url, init);
       };
-      this.#signedURLs = {};
+      this.#URLTokens = {};
       this.apiHost = "";
       this.playing = false;
       this.loop = false;
@@ -93,7 +95,7 @@ function ContextMixin(superClass) {
       this.#playbackAnimationFrameRequest = null;
       this.#AUDIO_PLAYBACK_SLICE_MS = 1e3;
     }
-    #signedURLs;
+    #URLTokens;
     connectedCallback() {
       super.connectedCallback();
       requestAnimationFrame(this.setStageScale);

package/dist/elements/src/gui/EFFilmstrip.js

@@ -73,17 +73,23 @@ class FilmstripItem extends TWMixin(LitElement) {
   get isFocused() {
     return this.element && this.focusContext?.focusedElement === this.element;
   }
-  get styles() {
+  get gutterStyles() {
     return {
       position: "relative",
-      left: `${this.pixelsPerMs * this.element.startTimeWithinParentMs}px`,
-      width: `${this.pixelsPerMs * this.element.durationMs}px`
+      left: `${this.pixelsPerMs * (this.element.startTimeWithinParentMs - this.element.trimStartMs)}px`,
+      width: `${this.pixelsPerMs * (this.element.durationMs + this.element.trimStartMs + this.element.trimEndMs)}px`
+    };
+  }
+  get trimPortionStyles() {
+    return {
+      width: `${this.pixelsPerMs * this.element.durationMs}px`,
+      left: `${this.pixelsPerMs * this.element.trimStartMs}px`
     };
   }
   render() {
-    return html` <div class="" style=${styleMap(this.styles)}>
+    return html`<div style=${styleMap(this.gutterStyles)}>
       <div
-        class="border-outset relative mb-[1px] block h-[1.1rem] text-nowrap border border-slate-500 bg-blue-200 hover:bg-blue-400 text-sm data-[focused]:bg-slate-400"
+        class="bg-slate-300"
         ?data-focused=${this.isFocused}
         @mouseenter=${() => {
       if (this.focusContext) {
@@ -96,7 +102,13 @@ class FilmstripItem extends TWMixin(LitElement) {
       }
     }}
       >
-        ${this.animations()}
+        <div
+          ?data-focused=${this.isFocused}
+          class="border-outset relative mb-[1px] block h-[1.1rem] text-nowrap border border-slate-500 bg-blue-200 text-sm data-[focused]:bg-slate-400"
+          style=${styleMap(this.trimPortionStyles)}
+        >
+          ${this.animations()}
+        </div>
       </div>
       ${this.renderChildren()}
     </div>`;

package/dist/elements/src/gui/EFWorkbench.js

@@ -74,7 +74,6 @@ let EFWorkbench = class extends ContextMixin(TWMixin(LitElement)) {
         >
           <slot
             ${ref(this.canvasRef)}
-            class="inline-block"
             name="canvas"
           ></slot>
           <div

package/dist/elements/src/gui/TWMixin.css.js

@@ -1,4 +1,4 @@
-const twStyle = "/*\n! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com\n*//*\n1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)\n2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)\n*/\n\n*,\n::before,\n::after {\n  box-sizing: border-box; /* 1 */\n  border-width: 0; /* 2 */\n  border-style: solid; /* 2 */\n  border-color: #e5e7eb; /* 2 */\n}\n\n::before,\n::after {\n  --tw-content: '';\n}\n\n/*\n1. Use a consistent sensible line-height in all browsers.\n2. Prevent adjustments of font size after orientation changes in iOS.\n3. Use a more readable tab size.\n4. Use the user's configured `sans` font-family by default.\n5. Use the user's configured `sans` font-feature-settings by default.\n6. Use the user's configured `sans` font-variation-settings by default.\n7. Disable tap highlights on iOS\n*/\n\nhtml,\n:host {\n  line-height: 1.5; /* 1 */\n  -webkit-text-size-adjust: 100%; /* 2 */\n  -moz-tab-size: 4; /* 3 */\n  -o-tab-size: 4;\n     tab-size: 4; /* 3 */\n  font-family: ui-sans-serif, system-ui, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\"; /* 4 */\n  font-feature-settings: normal; /* 5 */\n  font-variation-settings: normal; /* 6 */\n  -webkit-tap-highlight-color: transparent; /* 7 */\n}\n\n/*\n1. Remove the margin in all browsers.\n2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.\n*/\n\nbody {\n  margin: 0; /* 1 */\n  line-height: inherit; /* 2 */\n}\n\n/*\n1. Add the correct height in Firefox.\n2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)\n3. Ensure horizontal rules are visible by default.\n*/\n\nhr {\n  height: 0; /* 1 */\n  color: inherit; /* 2 */\n  border-top-width: 1px; /* 3 */\n}\n\n/*\nAdd the correct text decoration in Chrome, Edge, and Safari.\n*/\n\nabbr:where([title]) {\n  -webkit-text-decoration: underline dotted;\n          text-decoration: underline dotted;\n}\n\n/*\nRemove the default font size and weight for headings.\n*/\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  font-size: inherit;\n  font-weight: inherit;\n}\n\n/*\nReset links to optimize for opt-in styling instead of opt-out.\n*/\n\na {\n  color: inherit;\n  text-decoration: inherit;\n}\n\n/*\nAdd the correct font weight in Edge and Safari.\n*/\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\n/*\n1. Use the user's configured `mono` font-family by default.\n2. Use the user's configured `mono` font-feature-settings by default.\n3. Use the user's configured `mono` font-variation-settings by default.\n4. Correct the odd `em` font sizing in all browsers.\n*/\n\ncode,\nkbd,\nsamp,\npre {\n  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace; /* 1 */\n  font-feature-settings: normal; /* 2 */\n  font-variation-settings: normal; /* 3 */\n  font-size: 1em; /* 4 */\n}\n\n/*\nAdd the correct font size in all browsers.\n*/\n\nsmall {\n  font-size: 80%;\n}\n\n/*\nPrevent `sub` and `sup` elements from affecting the line height in all browsers.\n*/\n\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\nsup {\n  top: -0.5em;\n}\n\n/*\n1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)\n2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)\n3. Remove gaps between table borders by default.\n*/\n\ntable {\n  text-indent: 0; /* 1 */\n  border-color: inherit; /* 2 */\n  border-collapse: collapse; /* 3 */\n}\n\n/*\n1. Change the font styles in all browsers.\n2. Remove the margin in Firefox and Safari.\n3. Remove default padding in all browsers.\n*/\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  font-family: inherit; /* 1 */\n  font-feature-settings: inherit; /* 1 */\n  font-variation-settings: inherit; /* 1 */\n  font-size: 100%; /* 1 */\n  font-weight: inherit; /* 1 */\n  line-height: inherit; /* 1 */\n  letter-spacing: inherit; /* 1 */\n  color: inherit; /* 1 */\n  margin: 0; /* 2 */\n  padding: 0; /* 3 */\n}\n\n/*\nRemove the inheritance of text transform in Edge and Firefox.\n*/\n\nbutton,\nselect {\n  text-transform: none;\n}\n\n/*\n1. Correct the inability to style clickable types in iOS and Safari.\n2. Remove default button styles.\n*/\n\nbutton,\ninput:where([type='button']),\ninput:where([type='reset']),\ninput:where([type='submit']) {\n  -webkit-appearance: button; /* 1 */\n  background-color: transparent; /* 2 */\n  background-image: none; /* 2 */\n}\n\n/*\nUse the modern Firefox focus style for all focusable elements.\n*/\n\n:-moz-focusring {\n  outline: auto;\n}\n\n/*\nRemove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)\n*/\n\n:-moz-ui-invalid {\n  box-shadow: none;\n}\n\n/*\nAdd the correct vertical alignment in Chrome and Firefox.\n*/\n\nprogress {\n  vertical-align: baseline;\n}\n\n/*\nCorrect the cursor style of increment and decrement buttons in Safari.\n*/\n\n::-webkit-inner-spin-button,\n::-webkit-outer-spin-button {\n  height: auto;\n}\n\n/*\n1. Correct the odd appearance in Chrome and Safari.\n2. Correct the outline style in Safari.\n*/\n\n[type='search'] {\n  -webkit-appearance: textfield; /* 1 */\n  outline-offset: -2px; /* 2 */\n}\n\n/*\nRemove the inner padding in Chrome and Safari on macOS.\n*/\n\n::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n/*\n1. Correct the inability to style clickable types in iOS and Safari.\n2. Change font properties to `inherit` in Safari.\n*/\n\n::-webkit-file-upload-button {\n  -webkit-appearance: button; /* 1 */\n  font: inherit; /* 2 */\n}\n\n/*\nAdd the correct display in Chrome and Safari.\n*/\n\nsummary {\n  display: list-item;\n}\n\n/*\nRemoves the default spacing and border for appropriate elements.\n*/\n\nblockquote,\ndl,\ndd,\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\nhr,\nfigure,\np,\npre {\n  margin: 0;\n}\n\nfieldset {\n  margin: 0;\n  padding: 0;\n}\n\nlegend {\n  padding: 0;\n}\n\nol,\nul,\nmenu {\n  list-style: none;\n  margin: 0;\n  padding: 0;\n}\n\n/*\nReset default styling for dialogs.\n*/\ndialog {\n  padding: 0;\n}\n\n/*\nPrevent resizing textareas horizontally by default.\n*/\n\ntextarea {\n  resize: vertical;\n}\n\n/*\n1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)\n2. Set the default placeholder color to the user's configured gray 400 color.\n*/\n\ninput::-moz-placeholder, textarea::-moz-placeholder {\n  opacity: 1; /* 1 */\n  color: #9ca3af; /* 2 */\n}\n\ninput::placeholder,\ntextarea::placeholder {\n  opacity: 1; /* 1 */\n  color: #9ca3af; /* 2 */\n}\n\n/*\nSet the default cursor for buttons.\n*/\n\nbutton,\n[role=\"button\"] {\n  cursor: pointer;\n}\n\n/*\nMake sure disabled buttons don't get the pointer cursor.\n*/\n:disabled {\n  cursor: default;\n}\n\n/*\n1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)\n2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)\n   This can trigger a poorly considered lint error in some tools but is included by design.\n*/\n\nimg,\nsvg,\nvideo,\ncanvas,\naudio,\niframe,\nembed,\nobject {\n  display: block; /* 1 */\n  vertical-align: middle; /* 2 */\n}\n\n/*\nConstrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)\n*/\n\nimg,\nvideo {\n  max-width: 100%;\n  height: auto;\n}\n\n/* Make elements with the HTML hidden attribute stay hidden by default */\n[hidden] {\n  display: none;\n}\n\n*, ::before, ::after {\n  --tw-border-spacing-x: 0;\n  --tw-border-spacing-y: 0;\n  --tw-translate-x: 0;\n  --tw-translate-y: 0;\n  --tw-rotate: 0;\n  --tw-skew-x: 0;\n  --tw-skew-y: 0;\n  --tw-scale-x: 1;\n  --tw-scale-y: 1;\n  --tw-pan-x:  ;\n  --tw-pan-y:  ;\n  --tw-pinch-zoom:  ;\n  --tw-scroll-snap-strictness: proximity;\n  --tw-gradient-from-position:  ;\n  --tw-gradient-via-position:  ;\n  --tw-gradient-to-position:  ;\n  --tw-ordinal:  ;\n  --tw-slashed-zero:  ;\n  --tw-numeric-figure:  ;\n  --tw-numeric-spacing:  ;\n  --tw-numeric-fraction:  ;\n  --tw-ring-inset:  ;\n  --tw-ring-offset-width: 0px;\n  --tw-ring-offset-color: #fff;\n  --tw-ring-color: rgb(59 130 246 / 0.5);\n  --tw-ring-offset-shadow: 0 0 #0000;\n  --tw-ring-shadow: 0 0 #0000;\n  --tw-shadow: 0 0 #0000;\n  --tw-shadow-colored: 0 0 #0000;\n  --tw-blur:  ;\n  --tw-brightness:  ;\n  --tw-contrast:  ;\n  --tw-grayscale:  ;\n  --tw-hue-rotate:  ;\n  --tw-invert:  ;\n  --tw-saturate:  ;\n  --tw-sepia:  ;\n  --tw-drop-shadow:  ;\n  --tw-backdrop-blur:  ;\n  --tw-backdrop-brightness:  ;\n  --tw-backdrop-contrast:  ;\n  --tw-backdrop-grayscale:  ;\n  --tw-backdrop-hue-rotate:  ;\n  --tw-backdrop-invert:  ;\n  --tw-backdrop-opacity:  ;\n  --tw-backdrop-saturate:  ;\n  --tw-backdrop-sepia:  ;\n  --tw-contain-size:  ;\n  --tw-contain-layout:  ;\n  --tw-contain-paint:  ;\n  --tw-contain-style:  ;\n}\n\n::backdrop {\n  --tw-border-spacing-x: 0;\n  --tw-border-spacing-y: 0;\n  --tw-translate-x: 0;\n  --tw-translate-y: 0;\n  --tw-rotate: 0;\n  --tw-skew-x: 0;\n  --tw-skew-y: 0;\n  --tw-scale-x: 1;\n  --tw-scale-y: 1;\n  --tw-pan-x:  ;\n  --tw-pan-y:  ;\n  --tw-pinch-zoom:  ;\n  --tw-scroll-snap-strictness: proximity;\n  --tw-gradient-from-position:  ;\n  --tw-gradient-via-position:  ;\n  --tw-gradient-to-position:  ;\n  --tw-ordinal:  ;\n  --tw-slashed-zero:  ;\n  --tw-numeric-figure:  ;\n  --tw-numeric-spacing:  ;\n  --tw-numeric-fraction:  ;\n  --tw-ring-inset:  ;\n  --tw-ring-offset-width: 0px;\n  --tw-ring-offset-color: #fff;\n  --tw-ring-color: rgb(59 130 246 / 0.5);\n  --tw-ring-offset-shadow: 0 0 #0000;\n  --tw-ring-shadow: 0 0 #0000;\n  --tw-shadow: 0 0 #0000;\n  --tw-shadow-colored: 0 0 #0000;\n  --tw-blur:  ;\n  --tw-brightness:  ;\n  --tw-contrast:  ;\n  --tw-grayscale:  ;\n  --tw-hue-rotate:  ;\n  --tw-invert:  ;\n  --tw-saturate:  ;\n  --tw-sepia:  ;\n  --tw-drop-shadow:  ;\n  --tw-backdrop-blur:  ;\n  --tw-backdrop-brightness:  ;\n  --tw-backdrop-contrast:  ;\n  --tw-backdrop-grayscale:  ;\n  --tw-backdrop-hue-rotate:  ;\n  --tw-backdrop-invert:  ;\n  --tw-backdrop-opacity:  ;\n  --tw-backdrop-saturate:  ;\n  --tw-backdrop-sepia:  ;\n  --tw-contain-size:  ;\n  --tw-contain-layout:  ;\n  --tw-contain-paint:  ;\n  --tw-contain-style:  ;\n}\n.container {\n  width: 100%;\n}\n@media (min-width: 640px) {\n\n  .container {\n    max-width: 640px;\n  }\n}\n@media (min-width: 768px) {\n\n  .container {\n    max-width: 768px;\n  }\n}\n@media (min-width: 1024px) {\n\n  .container {\n    max-width: 1024px;\n  }\n}\n@media (min-width: 1280px) {\n\n  .container {\n    max-width: 1280px;\n  }\n}\n@media (min-width: 1536px) {\n\n  .container {\n    max-width: 1536px;\n  }\n}\n.pointer-events-none {\n  pointer-events: none;\n}\n.static {\n  position: static;\n}\n.fixed {\n  position: fixed;\n}\n.absolute {\n  position: absolute;\n}\n.relative {\n  position: relative;\n}\n.inset-0 {\n  inset: 0px;\n}\n.top-0 {\n  top: 0px;\n}\n.z-10 {\n  z-index: 10;\n}\n.z-20 {\n  z-index: 20;\n}\n.col-span-2 {\n  grid-column: span 2 / span 2;\n}\n.mb-\\[1px\\] {\n  margin-bottom: 1px;\n}\n.block {\n  display: block;\n}\n.inline-block {\n  display: inline-block;\n}\n.inline {\n  display: inline;\n}\n.flex {\n  display: flex;\n}\n.grid {\n  display: grid;\n}\n.contents {\n  display: contents;\n}\n.hidden {\n  display: none;\n}\n.h-\\[1\\.1rem\\] {\n  height: 1.1rem;\n}\n.h-\\[5px\\] {\n  height: 5px;\n}\n.h-full {\n  height: 100%;\n}\n.w-1 {\n  width: 0.25rem;\n}\n.w-\\[2px\\] {\n  width: 2px;\n}\n.w-full {\n  width: 100%;\n}\n.transform {\n  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));\n}\n.cursor-crosshair {\n  cursor: crosshair;\n}\n.resize {\n  resize: both;\n}\n.place-content-center {\n  place-content: center;\n}\n.place-items-center {\n  place-items: center;\n}\n.items-center {\n  align-items: center;\n}\n.overflow-auto {\n  overflow: auto;\n}\n.overflow-hidden {\n  overflow: hidden;\n}\n.text-nowrap {\n  text-wrap: nowrap;\n}\n.border {\n  border-width: 1px;\n}\n.border-r-2 {\n  border-right-width: 2px;\n}\n.border-blue-500 {\n  --tw-border-opacity: 1;\n  border-color: rgb(59 130 246 / var(--tw-border-opacity));\n}\n.border-red-700 {\n  --tw-border-opacity: 1;\n  border-color: rgb(185 28 28 / var(--tw-border-opacity));\n}\n.border-slate-500 {\n  --tw-border-opacity: 1;\n  border-color: rgb(100 116 139 / var(--tw-border-opacity));\n}\n.border-b-slate-600 {\n  --tw-border-opacity: 1;\n  border-bottom-color: rgb(71 85 105 / var(--tw-border-opacity));\n}\n.bg-blue-200 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(191 219 254 / var(--tw-bg-opacity));\n}\n.bg-blue-500 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(59 130 246 / var(--tw-bg-opacity));\n}\n.bg-red-500 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(239 68 68 / var(--tw-bg-opacity));\n}\n.bg-slate-100 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(241 245 249 / var(--tw-bg-opacity));\n}\n.bg-slate-200 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(226 232 240 / var(--tw-bg-opacity));\n}\n.bg-opacity-20 {\n  --tw-bg-opacity: 0.2;\n}\n.object-fill {\n  -o-object-fit: fill;\n     object-fit: fill;\n}\n.p-\\[1px\\] {\n  padding: 1px;\n}\n.pb-0 {\n  padding-bottom: 0px;\n}\n.pl-1 {\n  padding-left: 0.25rem;\n}\n.pl-2 {\n  padding-left: 0.5rem;\n}\n.pr-0 {\n  padding-right: 0px;\n}\n.pr-1 {\n  padding-right: 0.25rem;\n}\n.pt-2 {\n  padding-top: 0.5rem;\n}\n.font-mono {\n  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n}\n.text-sm {\n  font-size: 0.875rem;\n  line-height: 1.25rem;\n}\n.text-xs {\n  font-size: 0.75rem;\n  line-height: 1rem;\n}\n.opacity-50 {\n  opacity: 0.5;\n}\n.shadow {\n  --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);\n  --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);\n  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);\n}\n.shadow-slate-300 {\n  --tw-shadow-color: #cbd5e1;\n  --tw-shadow: var(--tw-shadow-colored);\n}\n.shadow-slate-600 {\n  --tw-shadow-color: #475569;\n  --tw-shadow: var(--tw-shadow-colored);\n}\n.filter {\n  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);\n}\n.transition {\n  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;\n  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;\n  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;\n  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);\n  transition-duration: 150ms;\n}\n.hover\\:bg-blue-400:hover {\n  --tw-bg-opacity: 1;\n  background-color: rgb(96 165 250 / var(--tw-bg-opacity));\n}\n.hover\\:bg-slate-400:hover {\n  --tw-bg-opacity: 1;\n  background-color: rgb(148 163 184 / var(--tw-bg-opacity));\n}\n.peer:hover ~ .peer-hover\\:border-slate-400 {\n  --tw-border-opacity: 1;\n  border-color: rgb(148 163 184 / var(--tw-border-opacity));\n}\n.peer:hover ~ .peer-hover\\:bg-slate-300 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n.data-\\[focused\\]\\:bg-slate-400[data-focused] {\n  --tw-bg-opacity: 1;\n  background-color: rgb(148 163 184 / var(--tw-bg-opacity));\n}\n.peer[data-focused] ~ .peer-data-\\[focused\\]\\:border-slate-400 {\n  --tw-border-opacity: 1;\n  border-color: rgb(148 163 184 / var(--tw-border-opacity));\n}\n.peer[data-focused] ~ .peer-data-\\[focused\\]\\:bg-slate-300 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n";
+const twStyle = "/*\n! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com\n*//*\n1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)\n2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)\n*/\n\n*,\n::before,\n::after {\n  box-sizing: border-box; /* 1 */\n  border-width: 0; /* 2 */\n  border-style: solid; /* 2 */\n  border-color: #e5e7eb; /* 2 */\n}\n\n::before,\n::after {\n  --tw-content: '';\n}\n\n/*\n1. Use a consistent sensible line-height in all browsers.\n2. Prevent adjustments of font size after orientation changes in iOS.\n3. Use a more readable tab size.\n4. Use the user's configured `sans` font-family by default.\n5. Use the user's configured `sans` font-feature-settings by default.\n6. Use the user's configured `sans` font-variation-settings by default.\n7. Disable tap highlights on iOS\n*/\n\nhtml,\n:host {\n  line-height: 1.5; /* 1 */\n  -webkit-text-size-adjust: 100%; /* 2 */\n  -moz-tab-size: 4; /* 3 */\n  -o-tab-size: 4;\n     tab-size: 4; /* 3 */\n  font-family: ui-sans-serif, system-ui, sans-serif, \"Apple Color Emoji\", \"Segoe UI Emoji\", \"Segoe UI Symbol\", \"Noto Color Emoji\"; /* 4 */\n  font-feature-settings: normal; /* 5 */\n  font-variation-settings: normal; /* 6 */\n  -webkit-tap-highlight-color: transparent; /* 7 */\n}\n\n/*\n1. Remove the margin in all browsers.\n2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.\n*/\n\nbody {\n  margin: 0; /* 1 */\n  line-height: inherit; /* 2 */\n}\n\n/*\n1. Add the correct height in Firefox.\n2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)\n3. Ensure horizontal rules are visible by default.\n*/\n\nhr {\n  height: 0; /* 1 */\n  color: inherit; /* 2 */\n  border-top-width: 1px; /* 3 */\n}\n\n/*\nAdd the correct text decoration in Chrome, Edge, and Safari.\n*/\n\nabbr:where([title]) {\n  -webkit-text-decoration: underline dotted;\n          text-decoration: underline dotted;\n}\n\n/*\nRemove the default font size and weight for headings.\n*/\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  font-size: inherit;\n  font-weight: inherit;\n}\n\n/*\nReset links to optimize for opt-in styling instead of opt-out.\n*/\n\na {\n  color: inherit;\n  text-decoration: inherit;\n}\n\n/*\nAdd the correct font weight in Edge and Safari.\n*/\n\nb,\nstrong {\n  font-weight: bolder;\n}\n\n/*\n1. Use the user's configured `mono` font-family by default.\n2. Use the user's configured `mono` font-feature-settings by default.\n3. Use the user's configured `mono` font-variation-settings by default.\n4. Correct the odd `em` font sizing in all browsers.\n*/\n\ncode,\nkbd,\nsamp,\npre {\n  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace; /* 1 */\n  font-feature-settings: normal; /* 2 */\n  font-variation-settings: normal; /* 3 */\n  font-size: 1em; /* 4 */\n}\n\n/*\nAdd the correct font size in all browsers.\n*/\n\nsmall {\n  font-size: 80%;\n}\n\n/*\nPrevent `sub` and `sup` elements from affecting the line height in all browsers.\n*/\n\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\nsup {\n  top: -0.5em;\n}\n\n/*\n1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)\n2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)\n3. Remove gaps between table borders by default.\n*/\n\ntable {\n  text-indent: 0; /* 1 */\n  border-color: inherit; /* 2 */\n  border-collapse: collapse; /* 3 */\n}\n\n/*\n1. Change the font styles in all browsers.\n2. Remove the margin in Firefox and Safari.\n3. Remove default padding in all browsers.\n*/\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  font-family: inherit; /* 1 */\n  font-feature-settings: inherit; /* 1 */\n  font-variation-settings: inherit; /* 1 */\n  font-size: 100%; /* 1 */\n  font-weight: inherit; /* 1 */\n  line-height: inherit; /* 1 */\n  letter-spacing: inherit; /* 1 */\n  color: inherit; /* 1 */\n  margin: 0; /* 2 */\n  padding: 0; /* 3 */\n}\n\n/*\nRemove the inheritance of text transform in Edge and Firefox.\n*/\n\nbutton,\nselect {\n  text-transform: none;\n}\n\n/*\n1. Correct the inability to style clickable types in iOS and Safari.\n2. Remove default button styles.\n*/\n\nbutton,\ninput:where([type='button']),\ninput:where([type='reset']),\ninput:where([type='submit']) {\n  -webkit-appearance: button; /* 1 */\n  background-color: transparent; /* 2 */\n  background-image: none; /* 2 */\n}\n\n/*\nUse the modern Firefox focus style for all focusable elements.\n*/\n\n:-moz-focusring {\n  outline: auto;\n}\n\n/*\nRemove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)\n*/\n\n:-moz-ui-invalid {\n  box-shadow: none;\n}\n\n/*\nAdd the correct vertical alignment in Chrome and Firefox.\n*/\n\nprogress {\n  vertical-align: baseline;\n}\n\n/*\nCorrect the cursor style of increment and decrement buttons in Safari.\n*/\n\n::-webkit-inner-spin-button,\n::-webkit-outer-spin-button {\n  height: auto;\n}\n\n/*\n1. Correct the odd appearance in Chrome and Safari.\n2. Correct the outline style in Safari.\n*/\n\n[type='search'] {\n  -webkit-appearance: textfield; /* 1 */\n  outline-offset: -2px; /* 2 */\n}\n\n/*\nRemove the inner padding in Chrome and Safari on macOS.\n*/\n\n::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n/*\n1. Correct the inability to style clickable types in iOS and Safari.\n2. Change font properties to `inherit` in Safari.\n*/\n\n::-webkit-file-upload-button {\n  -webkit-appearance: button; /* 1 */\n  font: inherit; /* 2 */\n}\n\n/*\nAdd the correct display in Chrome and Safari.\n*/\n\nsummary {\n  display: list-item;\n}\n\n/*\nRemoves the default spacing and border for appropriate elements.\n*/\n\nblockquote,\ndl,\ndd,\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\nhr,\nfigure,\np,\npre {\n  margin: 0;\n}\n\nfieldset {\n  margin: 0;\n  padding: 0;\n}\n\nlegend {\n  padding: 0;\n}\n\nol,\nul,\nmenu {\n  list-style: none;\n  margin: 0;\n  padding: 0;\n}\n\n/*\nReset default styling for dialogs.\n*/\ndialog {\n  padding: 0;\n}\n\n/*\nPrevent resizing textareas horizontally by default.\n*/\n\ntextarea {\n  resize: vertical;\n}\n\n/*\n1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)\n2. Set the default placeholder color to the user's configured gray 400 color.\n*/\n\ninput::-moz-placeholder, textarea::-moz-placeholder {\n  opacity: 1; /* 1 */\n  color: #9ca3af; /* 2 */\n}\n\ninput::placeholder,\ntextarea::placeholder {\n  opacity: 1; /* 1 */\n  color: #9ca3af; /* 2 */\n}\n\n/*\nSet the default cursor for buttons.\n*/\n\nbutton,\n[role=\"button\"] {\n  cursor: pointer;\n}\n\n/*\nMake sure disabled buttons don't get the pointer cursor.\n*/\n:disabled {\n  cursor: default;\n}\n\n/*\n1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)\n2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)\n   This can trigger a poorly considered lint error in some tools but is included by design.\n*/\n\nimg,\nsvg,\nvideo,\ncanvas,\naudio,\niframe,\nembed,\nobject {\n  display: block; /* 1 */\n  vertical-align: middle; /* 2 */\n}\n\n/*\nConstrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)\n*/\n\nimg,\nvideo {\n  max-width: 100%;\n  height: auto;\n}\n\n/* Make elements with the HTML hidden attribute stay hidden by default */\n[hidden] {\n  display: none;\n}\n\n*, ::before, ::after {\n  --tw-border-spacing-x: 0;\n  --tw-border-spacing-y: 0;\n  --tw-translate-x: 0;\n  --tw-translate-y: 0;\n  --tw-rotate: 0;\n  --tw-skew-x: 0;\n  --tw-skew-y: 0;\n  --tw-scale-x: 1;\n  --tw-scale-y: 1;\n  --tw-pan-x:  ;\n  --tw-pan-y:  ;\n  --tw-pinch-zoom:  ;\n  --tw-scroll-snap-strictness: proximity;\n  --tw-gradient-from-position:  ;\n  --tw-gradient-via-position:  ;\n  --tw-gradient-to-position:  ;\n  --tw-ordinal:  ;\n  --tw-slashed-zero:  ;\n  --tw-numeric-figure:  ;\n  --tw-numeric-spacing:  ;\n  --tw-numeric-fraction:  ;\n  --tw-ring-inset:  ;\n  --tw-ring-offset-width: 0px;\n  --tw-ring-offset-color: #fff;\n  --tw-ring-color: rgb(59 130 246 / 0.5);\n  --tw-ring-offset-shadow: 0 0 #0000;\n  --tw-ring-shadow: 0 0 #0000;\n  --tw-shadow: 0 0 #0000;\n  --tw-shadow-colored: 0 0 #0000;\n  --tw-blur:  ;\n  --tw-brightness:  ;\n  --tw-contrast:  ;\n  --tw-grayscale:  ;\n  --tw-hue-rotate:  ;\n  --tw-invert:  ;\n  --tw-saturate:  ;\n  --tw-sepia:  ;\n  --tw-drop-shadow:  ;\n  --tw-backdrop-blur:  ;\n  --tw-backdrop-brightness:  ;\n  --tw-backdrop-contrast:  ;\n  --tw-backdrop-grayscale:  ;\n  --tw-backdrop-hue-rotate:  ;\n  --tw-backdrop-invert:  ;\n  --tw-backdrop-opacity:  ;\n  --tw-backdrop-saturate:  ;\n  --tw-backdrop-sepia:  ;\n  --tw-contain-size:  ;\n  --tw-contain-layout:  ;\n  --tw-contain-paint:  ;\n  --tw-contain-style:  ;\n}\n\n::backdrop {\n  --tw-border-spacing-x: 0;\n  --tw-border-spacing-y: 0;\n  --tw-translate-x: 0;\n  --tw-translate-y: 0;\n  --tw-rotate: 0;\n  --tw-skew-x: 0;\n  --tw-skew-y: 0;\n  --tw-scale-x: 1;\n  --tw-scale-y: 1;\n  --tw-pan-x:  ;\n  --tw-pan-y:  ;\n  --tw-pinch-zoom:  ;\n  --tw-scroll-snap-strictness: proximity;\n  --tw-gradient-from-position:  ;\n  --tw-gradient-via-position:  ;\n  --tw-gradient-to-position:  ;\n  --tw-ordinal:  ;\n  --tw-slashed-zero:  ;\n  --tw-numeric-figure:  ;\n  --tw-numeric-spacing:  ;\n  --tw-numeric-fraction:  ;\n  --tw-ring-inset:  ;\n  --tw-ring-offset-width: 0px;\n  --tw-ring-offset-color: #fff;\n  --tw-ring-color: rgb(59 130 246 / 0.5);\n  --tw-ring-offset-shadow: 0 0 #0000;\n  --tw-ring-shadow: 0 0 #0000;\n  --tw-shadow: 0 0 #0000;\n  --tw-shadow-colored: 0 0 #0000;\n  --tw-blur:  ;\n  --tw-brightness:  ;\n  --tw-contrast:  ;\n  --tw-grayscale:  ;\n  --tw-hue-rotate:  ;\n  --tw-invert:  ;\n  --tw-saturate:  ;\n  --tw-sepia:  ;\n  --tw-drop-shadow:  ;\n  --tw-backdrop-blur:  ;\n  --tw-backdrop-brightness:  ;\n  --tw-backdrop-contrast:  ;\n  --tw-backdrop-grayscale:  ;\n  --tw-backdrop-hue-rotate:  ;\n  --tw-backdrop-invert:  ;\n  --tw-backdrop-opacity:  ;\n  --tw-backdrop-saturate:  ;\n  --tw-backdrop-sepia:  ;\n  --tw-contain-size:  ;\n  --tw-contain-layout:  ;\n  --tw-contain-paint:  ;\n  --tw-contain-style:  ;\n}\n.container {\n  width: 100%;\n}\n@media (min-width: 640px) {\n\n  .container {\n    max-width: 640px;\n  }\n}\n@media (min-width: 768px) {\n\n  .container {\n    max-width: 768px;\n  }\n}\n@media (min-width: 1024px) {\n\n  .container {\n    max-width: 1024px;\n  }\n}\n@media (min-width: 1280px) {\n\n  .container {\n    max-width: 1280px;\n  }\n}\n@media (min-width: 1536px) {\n\n  .container {\n    max-width: 1536px;\n  }\n}\n.pointer-events-none {\n  pointer-events: none;\n}\n.static {\n  position: static;\n}\n.fixed {\n  position: fixed;\n}\n.absolute {\n  position: absolute;\n}\n.relative {\n  position: relative;\n}\n.inset-0 {\n  inset: 0px;\n}\n.top-0 {\n  top: 0px;\n}\n.z-10 {\n  z-index: 10;\n}\n.z-20 {\n  z-index: 20;\n}\n.col-span-2 {\n  grid-column: span 2 / span 2;\n}\n.mb-\\[1px\\] {\n  margin-bottom: 1px;\n}\n.block {\n  display: block;\n}\n.inline-block {\n  display: inline-block;\n}\n.inline {\n  display: inline;\n}\n.flex {\n  display: flex;\n}\n.grid {\n  display: grid;\n}\n.contents {\n  display: contents;\n}\n.hidden {\n  display: none;\n}\n.h-\\[1\\.1rem\\] {\n  height: 1.1rem;\n}\n.h-\\[5px\\] {\n  height: 5px;\n}\n.h-full {\n  height: 100%;\n}\n.w-1 {\n  width: 0.25rem;\n}\n.w-\\[2px\\] {\n  width: 2px;\n}\n.w-full {\n  width: 100%;\n}\n.transform {\n  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));\n}\n.cursor-crosshair {\n  cursor: crosshair;\n}\n.resize {\n  resize: both;\n}\n.place-content-center {\n  place-content: center;\n}\n.place-items-center {\n  place-items: center;\n}\n.items-center {\n  align-items: center;\n}\n.overflow-auto {\n  overflow: auto;\n}\n.overflow-hidden {\n  overflow: hidden;\n}\n.text-nowrap {\n  text-wrap: nowrap;\n}\n.border {\n  border-width: 1px;\n}\n.border-r-2 {\n  border-right-width: 2px;\n}\n.border-blue-500 {\n  --tw-border-opacity: 1;\n  border-color: rgb(59 130 246 / var(--tw-border-opacity));\n}\n.border-red-700 {\n  --tw-border-opacity: 1;\n  border-color: rgb(185 28 28 / var(--tw-border-opacity));\n}\n.border-slate-500 {\n  --tw-border-opacity: 1;\n  border-color: rgb(100 116 139 / var(--tw-border-opacity));\n}\n.border-b-slate-600 {\n  --tw-border-opacity: 1;\n  border-bottom-color: rgb(71 85 105 / var(--tw-border-opacity));\n}\n.bg-blue-200 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(191 219 254 / var(--tw-bg-opacity));\n}\n.bg-blue-500 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(59 130 246 / var(--tw-bg-opacity));\n}\n.bg-red-500 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(239 68 68 / var(--tw-bg-opacity));\n}\n.bg-slate-100 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(241 245 249 / var(--tw-bg-opacity));\n}\n.bg-slate-200 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(226 232 240 / var(--tw-bg-opacity));\n}\n.bg-slate-300 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n.bg-opacity-20 {\n  --tw-bg-opacity: 0.2;\n}\n.object-fill {\n  -o-object-fit: fill;\n     object-fit: fill;\n}\n.p-\\[1px\\] {\n  padding: 1px;\n}\n.pb-0 {\n  padding-bottom: 0px;\n}\n.pl-1 {\n  padding-left: 0.25rem;\n}\n.pl-2 {\n  padding-left: 0.5rem;\n}\n.pr-0 {\n  padding-right: 0px;\n}\n.pr-1 {\n  padding-right: 0.25rem;\n}\n.pt-2 {\n  padding-top: 0.5rem;\n}\n.font-mono {\n  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, \"Liberation Mono\", \"Courier New\", monospace;\n}\n.text-sm {\n  font-size: 0.875rem;\n  line-height: 1.25rem;\n}\n.text-xs {\n  font-size: 0.75rem;\n  line-height: 1rem;\n}\n.opacity-50 {\n  opacity: 0.5;\n}\n.shadow {\n  --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1);\n  --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color);\n  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);\n}\n.shadow-slate-300 {\n  --tw-shadow-color: #cbd5e1;\n  --tw-shadow: var(--tw-shadow-colored);\n}\n.shadow-slate-600 {\n  --tw-shadow-color: #475569;\n  --tw-shadow: var(--tw-shadow-colored);\n}\n.filter {\n  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);\n}\n.transition {\n  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;\n  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;\n  transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;\n  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);\n  transition-duration: 150ms;\n}\n.hover\\:bg-slate-400:hover {\n  --tw-bg-opacity: 1;\n  background-color: rgb(148 163 184 / var(--tw-bg-opacity));\n}\n.peer:hover ~ .peer-hover\\:border-slate-400 {\n  --tw-border-opacity: 1;\n  border-color: rgb(148 163 184 / var(--tw-border-opacity));\n}\n.peer:hover ~ .peer-hover\\:bg-slate-300 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n.data-\\[focused\\]\\:bg-slate-400[data-focused] {\n  --tw-bg-opacity: 1;\n  background-color: rgb(148 163 184 / var(--tw-bg-opacity));\n}\n.peer[data-focused] ~ .peer-data-\\[focused\\]\\:border-slate-400 {\n  --tw-border-opacity: 1;\n  border-color: rgb(148 163 184 / var(--tw-border-opacity));\n}\n.peer[data-focused] ~ .peer-data-\\[focused\\]\\:bg-slate-300 {\n  --tw-bg-opacity: 1;\n  background-color: rgb(203 213 225 / var(--tw-bg-opacity));\n}\n";
 export {
   twStyle as default
 };

package/dist/gui/EFFilmstrip.d.ts

@@ -23,11 +23,15 @@ declare class FilmstripItem extends FilmstripItem_base {
     get isFocused(): boolean;
     element: TemporalMixinInterface & LitElement;
     pixelsPerMs: number;
-    get styles(): {
+    get gutterStyles(): {
         position: string;
         left: string;
         width: string;
     };
+    get trimPortionStyles(): {
+        width: string;
+        left: string;
+    };
     render(): TemplateResult<1>;
     renderChildren(): Array<TemplateResult<1> | typeof nothing> | typeof nothing;
     contents(): TemplateResult<1>;

package/dist/style.css

@@ -675,6 +675,10 @@ video {
   --tw-bg-opacity: 1;
   background-color: rgb(226 232 240 / var(--tw-bg-opacity));
 }
+.bg-slate-300 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(203 213 225 / var(--tw-bg-opacity));
+}
 .bg-opacity-20 {
   --tw-bg-opacity: 0.2;
 }
@@ -764,11 +768,6 @@ body {
   -webkit-text-size-adjust: 100%;
 }
 
-.hover\:bg-blue-400:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(96 165 250 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-slate-400:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(148 163 184 / var(--tw-bg-opacity));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/elements",
-  "version": "0.8.0-beta.1",
+  "version": "0.8.0-beta.3",
   "description": "",
   "exports": {
     ".": {
@@ -20,7 +20,7 @@
   "author": "",
   "license": "UNLICENSED",
   "dependencies": {
-    "@editframe/assets": "0.8.0-beta.1",
+    "@editframe/assets": "0.8.0-beta.3",
     "@lit/context": "^1.1.2",
     "@lit/task": "^1.0.1",
     "d3": "^7.9.0",

package/src/elements/EFCaptions.ts

@@ -149,13 +149,15 @@ export class EFCaptions extends EFSourceMixin(
     let endMs = 0;
     for (const segment of caption.segments) {
       if (
-        this.targetElement.ownCurrentTimeMs >= segment.start * 1000 &&
-        this.targetElement.ownCurrentTimeMs <= segment.end * 1000
+        this.targetElement.trimAdjustedOwnCurrentTimeMs >=
+          segment.start * 1000 &&
+        this.targetElement.trimAdjustedOwnCurrentTimeMs <= segment.end * 1000
       ) {
         for (const word of segment.words) {
           if (
-            this.targetElement.ownCurrentTimeMs >= word.start * 1000 &&
-            this.targetElement.ownCurrentTimeMs <= word.end * 1000
+            this.targetElement.trimAdjustedOwnCurrentTimeMs >=
+              word.start * 1000 &&
+            this.targetElement.trimAdjustedOwnCurrentTimeMs <= word.end * 1000
           ) {
             words.push(word.text);
             startMs = word.start * 1000;

package/src/elements/EFMedia.ts

@@ -145,7 +145,11 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
 
       const result: Record<
         string,
-        { segment: TrackSegment; track: MP4Box.TrackInfo }
+        {
+          segment: TrackSegment;
+          track: MP4Box.TrackInfo;
+          nextSegment?: TrackSegment;
+        }
       > = {};
 
       for (const index of Object.values(fragmentIndex)) {
@@ -161,11 +165,15 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
           return (segment.dts / track.timescale) * 1000 <= seekToMs;
         });
 
+        const nextSegment = index.segments.find((segment) => {
+          return (segment.dts / track.timescale) * 1000 > seekToMs;
+        });
+
         if (!segment) {
           return;
         }
 
-        result[index.track] = { segment, track };
+        result[index.track] = { segment, track, nextSegment };
       }
 
       return result;
@@ -187,7 +195,9 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
 
       const files: Record<string, File> = {};
 
-      for (const [trackId, { segment, track }] of Object.entries(seekResult)) {
+      for (const [trackId, { segment, track, nextSegment }] of Object.entries(
+        seekResult,
+      )) {
         const start = segment.offset;
         const end = segment.offset + segment.size;
 
@@ -196,6 +206,21 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
           headers: { Range: `bytes=${start}-${end}` },
         });
 
+        if (nextSegment) {
+          const nextStart = nextSegment.offset;
+          const nextEnd = nextSegment.offset + nextSegment.size;
+          fetch(this.fragmentTrackPath(trackId), {
+            signal,
+            headers: { Range: `bytes=${nextStart}-${nextEnd}` },
+          })
+            .then(() => {
+              log("Prefetched next segment");
+            })
+            .catch((error) => {
+              log("Failed to prefetch next segment", error);
+            });
+        }
+
         const initSegment = Object.values(initSegments).find(
           (initSegment) => initSegment.trackId === String(track.id),
         );
@@ -253,7 +278,7 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
     changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>,
   ): void {
     if (changedProperties.has("ownCurrentTimeMs")) {
-      this.executeSeek(this.ownCurrentTimeMs);
+      this.executeSeek(this.trimAdjustedOwnCurrentTimeMs);
     }
   }
 
@@ -274,7 +299,7 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
     if (durations.length === 0) {
       return 0;
     }
-    return Math.max(...durations);
+    return Math.max(...durations) - this.trimStartMs - this.trimEndMs;
   }
 
   get startTimeMs() {
@@ -315,8 +340,8 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
 
   async fetchAudioSpanningTime(fromMs: number, toMs: number) {
     // Adjust range for track's own time
-    fromMs -= this.startTimeMs;
-    toMs -= this.startTimeMs;
+    fromMs -= this.startTimeMs - this.trimStartMs;
+    toMs -= this.startTimeMs - this.trimStartMs;
 
     await this.trackFragmentIndexLoader.taskComplete;
     const audioTrackId = this.defaultAudioTrackId;
@@ -340,6 +365,7 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
       },
     );
 
+    console.log({ fromMs, toMs });
     const fragments = Object.values(audioTrackIndex.segments).filter(
       (segment) => {
         const segmentStartsBeforeEnd =
@@ -383,10 +409,13 @@ export class EFMedia extends EFSourceMixin(EFTemporal(FetchMixin(LitElement)), {
 
     return {
       blob: audioBlob,
-      startMs: (firstFragment.dts / audioTrackIndex.timescale) * 1000,
+      startMs:
+        (firstFragment.dts / audioTrackIndex.timescale) * 1000 -
+        this.trimStartMs,
       endMs:
         (lastFragment.dts / audioTrackIndex.timescale) * 1000 +
-        (lastFragment.duration / audioTrackIndex.timescale) * 1000,
+        (lastFragment.duration / audioTrackIndex.timescale) * 1000 -
+        this.trimEndMs,
     };
   }
 }

package/src/elements/EFTemporal.ts

@@ -13,11 +13,14 @@ export const timegroupContext = createContext<EFTimegroup>(
 
 export declare class TemporalMixinInterface {
   get hasOwnDuration(): boolean;
+  get trimStartMs(): number;
+  get trimEndMs(): number;
   get durationMs(): number;
   get startTimeMs(): number;
   get startTimeWithinParentMs(): number;
   get endTimeMs(): number;
   get ownCurrentTimeMs(): number;
+  get trimAdjustedOwnCurrentTimeMs(): number;
 
   set duration(value: string);
   get duration(): string;
@@ -153,6 +156,36 @@ export const EFTemporal = <T extends Constructor<LitElement>>(
     })
     private _durationMs?: number;
 
+    @property({
+      type: Number,
+      attribute: "trimstart",
+      converter: durationConverter,
+    })
+    private _trimStartMs = 0;
+    public get trimStartMs(): number {
+      return this._trimStartMs;
+    }
+
+    @property({
+      type: Number,
+      attribute: "trimend",
+      converter: durationConverter,
+    })
+    private _trimEndMs = 0;
+    public get trimEndMs(): number {
+      return this._trimEndMs;
+    }
+
+    @property({
+      type: Number,
+      attribute: "startoffset",
+      converter: durationConverter,
+    })
+    private _startOffsetMs = 0;
+    public get startOffsetMs(): number {
+      return this._startOffsetMs;
+    }
+
     @state()
     rootTimegroup?: EFTimegroup = this.getRootTimegroup();
 
@@ -220,9 +253,15 @@ export const EFTemporal = <T extends Constructor<LitElement>>(
           }
           startTimeMsCache.set(
             this,
-            previous.startTimeMs + previous.durationMs,
+            previous.startTimeMs +
+              previous.durationMs -
+              parentTimegroup.overlapMs,
+          );
+          return (
+            previous.startTimeMs +
+            previous.durationMs -
+            parentTimegroup.overlapMs
           );
-          return previous.startTimeMs + previous.durationMs;
         }
         case "contain":
         case "fixed":
@@ -250,6 +289,25 @@ export const EFTemporal = <T extends Constructor<LitElement>>(
       return 0;
     }
 
+    /**
+     * Used to calculate the internal currentTimeMs of the element. This is useful
+     * for mapping to internal media time codes for audio/video elements.
+     */
+    get trimAdjustedOwnCurrentTimeMs() {
+      if (this.rootTimegroup) {
+        return Math.min(
+          Math.max(
+            0,
+            this.rootTimegroup.currentTimeMs -
+              this.startTimeMs +
+              this.trimStartMs,
+          ),
+          this.durationMs + Math.abs(this.startOffsetMs) + this.trimStartMs,
+        );
+      }
+      return 0;
+    }
+
     frameTask = new Task(this, {
       autoRun: EF_INTERACTIVE,
       args: () => [this.ownCurrentTimeMs] as const,

package/src/elements/EFTimegroup.ts

@@ -13,6 +13,7 @@ import {
 import { TimegroupController } from "./TimegroupController.ts";
 import { EF_INTERACTIVE } from "../EF_INTERACTIVE.ts";
 import { deepGetMediaElements } from "./EFMedia.ts";
+import { durationConverter } from "./durationConverter.ts";
 
 const log = debug("ef:elements:EFTimegroup");
 
@@ -37,7 +38,7 @@ export class EFTimegroup extends EFTemporal(LitElement) {
       display: block;
       width: 100%;
       height: 100%;
-      position: relative;
+      position: absolute;
       top: 0;
     }
   `;
@@ -53,6 +54,13 @@ export class EFTimegroup extends EFTemporal(LitElement) {
   })
   mode: "fixed" | "sequence" | "contain" = "sequence";
 
+  @property({
+    type: Number,
+    converter: durationConverter,
+    attribute: "overlap",
+  })
+  overlapMs = 0;
+
   @property({ type: Number })
   set currentTime(time: number) {
     this.#currentTime = Math.max(0, Math.min(time, this.durationMs / 1000));
@@ -76,25 +84,6 @@ export class EFTimegroup extends EFTemporal(LitElement) {
     this.currentTime = ms / 1000;
   }
 
-  @property({
-    attribute: "crossover",
-    converter: {
-      fromAttribute: (value: string): number => {
-        if (value.endsWith("ms")) {
-          return Number.parseFloat(value);
-        }
-        if (value.endsWith("s")) {
-          return Number.parseFloat(value) * 1000;
-        }
-        throw new Error(
-          "`crossover` MUST be in milliseconds or seconds (10s, 10000ms)",
-        );
-      },
-      toAttribute: (value: number) => `${value}ms`,
-    },
-  })
-  crossoverMs = 0;
-
   render() {
     return html`<slot></slot> `;
   }
@@ -134,32 +123,18 @@ export class EFTimegroup extends EFTemporal(LitElement) {
     return `ef-timegroup-${this.id}`;
   }
 
-  get crossoverStartMs() {
-    const parentTimeGroup = this.parentTimegroup;
-    if (!parentTimeGroup || !this.previousElementSibling) {
-      return 0;
-    }
-
-    return parentTimeGroup.crossoverMs;
-  }
-  get crossoverEndMs() {
-    const parentTimeGroup = this.parentTimegroup;
-    if (!parentTimeGroup || !this.nextElementSibling) {
-      return 0;
-    }
-
-    return parentTimeGroup.crossoverMs;
-  }
-
   get durationMs() {
     switch (this.mode) {
       case "fixed":
         return super.durationMs;
       case "sequence": {
         let duration = 0;
-        for (const node of this.childTemporals) {
+        this.childTemporals.forEach((node, index) => {
+          if (index > 0) {
+            duration -= this.overlapMs;
+          }
           duration += node.durationMs;
-        }
+        });
         return duration;
       }
       case "contain": {
@@ -207,9 +182,14 @@ export class EFTimegroup extends EFTemporal(LitElement) {
       this.style.display = "";
 
       const animations = this.getAnimations({ subtree: true });
+      this.style.setProperty("--ef-duration", `${this.durationMs}ms`);
+      this.style.setProperty(
+        "--ef-transition--duration",
+        `${this.parentTimegroup?.overlapMs ?? 0}ms`,
+      );
       this.style.setProperty(
-        "--ef-duration",
-        `${this.durationMs + this.crossoverEndMs + this.crossoverStartMs}ms`,
+        "--ef-transition-out-start",
+        `${this.durationMs - (this.parentTimegroup?.overlapMs ?? 0)}ms`,
       );
 
       for (const animation of animations) {

package/src/elements/EFWaveform.ts

@@ -351,7 +351,7 @@ export class EFWaveform extends EFTemporal(TWMixin(LitElement)) {
     if (!this.targetElement.audioBufferTask.value) {
       return;
     }
-    if (this.targetElement.ownCurrentTimeMs > 0) {
+    if (this.targetElement.trimAdjustedOwnCurrentTimeMs > 0) {
       const audioContext = new OfflineAudioContext(2, 48000 / 25, 48000);
       const audioBufferSource = audioContext.createBufferSource();
       audioBufferSource.buffer =
@@ -364,7 +364,7 @@ export class EFWaveform extends EFTemporal(TWMixin(LitElement)) {
         0,
         Math.max(
           0,
-          (this.targetElement.ownCurrentTimeMs -
+          (this.targetElement.trimAdjustedOwnCurrentTimeMs -
             this.targetElement.audioBufferTask.value.startOffsetMs) /
             1000,
         ),

package/src/elements/durationConverter.ts

@@ -4,3 +4,23 @@ export const durationConverter = {
   fromAttribute: (value: string): number => parseTimeToMs(value),
   toAttribute: (value: number) => `${value}s`,
 };
+
+const positiveDurationConverter = (error: string) => {
+  return {
+    fromAttribute: (value: string): number => {
+      if (value.startsWith("-")) {
+        throw new Error(error);
+      }
+      return parseTimeToMs(value);
+    },
+    toAttribute: (value: number) => `${value}s`,
+  };
+};
+
+export const trimDurationConverter = positiveDurationConverter(
+  "Trimstart & trimend must be a positive value in milliseconds or seconds (1s, 1000ms)",
+);
+
+export const imageDurationConverter = positiveDurationConverter(
+  "Image duration must be a positive value in milliseconds or seconds (1s, 1000ms)",
+);

package/src/elements/parseTimeToMs.ts

@@ -1,4 +1,5 @@
 export const parseTimeToMs = (time: string) => {
+  console.log("parseTimeToMs", time);
   if (time.endsWith("ms")) {
     return Number.parseFloat(time);
   }

package/src/gui/ContextMixin.ts

@@ -51,13 +51,13 @@ export function ContextMixin<T extends Constructor<LitElement>>(superClass: T) {
       }
 
       if (this.signingURL) {
-        if (!this.#signedURLs[url]) {
-          this.#signedURLs[url] = fetch(this.signingURL, {
+        if (!this.#URLTokens[url]) {
+          this.#URLTokens[url] = fetch(this.signingURL, {
             method: "POST",
             body: JSON.stringify({ url }),
           }).then(async (response) => {
             if (response.ok) {
-              return (await response.json()).url;
+              return (await response.json()).token;
             }
             throw new Error(
               `Failed to sign URL: ${url}. SigningURL: ${this.signingURL} ${response.status} ${response.statusText}`,
@@ -65,15 +65,17 @@ export function ContextMixin<T extends Constructor<LitElement>>(superClass: T) {
           });
         }
 
-        const signedURL = await this.#signedURLs[url];
+        const urlToken = await this.#URLTokens[url];
 
-        return fetch(signedURL, init);
+        Object.assign(init.headers, {
+          authorization: `Bearer ${urlToken}`,
+        });
       }
 
       return fetch(url, init);
     };
 
-    #signedURLs: Record<string, Promise<string>> = {};
+    #URLTokens: Record<string, Promise<string>> = {};
 
     @property({ type: String })
     signingURL?: string;

package/src/gui/EFFilmstrip.ts

@@ -86,18 +86,25 @@ class FilmstripItem extends TWMixin(LitElement) {
   @property({ type: Number })
   pixelsPerMs = 0.04;
 
-  get styles() {
+  get gutterStyles() {
     return {
       position: "relative",
-      left: `${this.pixelsPerMs * this.element.startTimeWithinParentMs}px`,
+      left: `${this.pixelsPerMs * (this.element.startTimeWithinParentMs - this.element.trimStartMs)}px`,
+      width: `${this.pixelsPerMs * (this.element.durationMs + this.element.trimStartMs + this.element.trimEndMs)}px`,
+    };
+  }
+
+  get trimPortionStyles() {
+    return {
       width: `${this.pixelsPerMs * this.element.durationMs}px`,
+      left: `${this.pixelsPerMs * this.element.trimStartMs}px`,
     };
   }
 
   render() {
-    return html` <div class="" style=${styleMap(this.styles)}>
+    return html`<div style=${styleMap(this.gutterStyles)}>
       <div
-        class="border-outset relative mb-[1px] block h-[1.1rem] text-nowrap border border-slate-500 bg-blue-200 hover:bg-blue-400 text-sm data-[focused]:bg-slate-400"
+        class="bg-slate-300"
         ?data-focused=${this.isFocused}
         @mouseenter=${() => {
           if (this.focusContext) {
@@ -110,7 +117,13 @@ class FilmstripItem extends TWMixin(LitElement) {
           }
         }}
       >
-        ${this.animations()}
+        <div
+          ?data-focused=${this.isFocused}
+          class="border-outset relative mb-[1px] block h-[1.1rem] text-nowrap border border-slate-500 bg-blue-200 text-sm data-[focused]:bg-slate-400"
+          style=${styleMap(this.trimPortionStyles)}
+        >
+          ${this.animations()}
+        </div>
       </div>
       ${this.renderChildren()}
     </div>`;

package/src/gui/EFWorkbench.ts

@@ -83,7 +83,6 @@ export class EFWorkbench extends ContextMixin(TWMixin(LitElement)) {
         >
           <slot
             ${ref(this.canvasRef)}
-            class="inline-block"
             name="canvas"
           ></slot>
           <div