@editframe/elements 0.15.0-beta.11 → 0.15.0-beta.13

package/dist/elements/EFMedia.d.ts

@@ -19,7 +19,7 @@ export declare class EFMedia extends EFMedia_base {
     get assetId(): string | null;
     fragmentIndexPath(): string;
     fragmentTrackPath(trackId: string): string;
-    trackFragmentIndexLoader: Task<readonly [string, typeof fetch], Record<number, TrackFragmentIndex>>;
+    trackFragmentIndexLoader: Task<readonly [string, typeof fetch], Record<number, TrackFragmentIndex> | undefined>;
     initSegmentsLoader: Task<readonly [Record<number, TrackFragmentIndex> | undefined, string, typeof fetch], {
         trackId: string;
         buffer: MP4Box.MP4ArrayBuffer;

package/dist/elements/EFMedia.js

@@ -70,8 +70,13 @@ const _EFMedia = class _EFMedia2 extends EFTargetable(
     this.trackFragmentIndexLoader = new Task(this, {
       args: () => [this.fragmentIndexPath(), this.fetch],
       task: async ([fragmentIndexPath, fetch], { signal }) => {
-        const response = await fetch(fragmentIndexPath, { signal });
-        return await response.json();
+        try {
+          const response = await fetch(fragmentIndexPath, { signal });
+          return await response.json();
+        } catch (error) {
+          log("Failed to load track fragment index", error);
+          return void 0;
+        }
       },
       onComplete: () => {
         this.requestUpdate("ownCurrentTimeMs");

package/dist/elements/EFTimegroup.d.ts

@@ -27,7 +27,7 @@ export declare class EFTimegroup extends EFTimegroup_base {
      * that caused issues with constructing audio data. We had negative durations
      * in calculations and it was not clear why.
      */
-    waitForMediaDurations(): Promise<Record<number, import('../../../assets/src/index.ts').TrackFragmentIndex>[]>;
+    waitForMediaDurations(): Promise<(Record<number, import('../../../assets/src/index.ts').TrackFragmentIndex> | undefined)[]>;
     get childTemporals(): import('./EFTemporal.js').TemporalMixinInterface[];
     protected updated(changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;
     private updateAnimations;

package/dist/gui/TWMixin.js

@@ -18,13 +18,25 @@ function TWMixin(Base) {
           "twSheet not found. Probable cause: CSSStyleSheet not supported in this environment"
         );
       }
+      const constructorStylesheets = [];
+      const constructorStyles = "styles" in this.constructor && this.constructor.styles || [];
+      if (Array.isArray(constructorStyles)) {
+        for (const item of constructorStyles) {
+          if (item.styleSheet) {
+            constructorStylesheets.push(item.styleSheet);
+          }
+        }
+      } else if (constructorStyles.styleSheet) {
+        constructorStylesheets.push(constructorStyles.styleSheet);
+      }
       if (renderRoot?.adoptedStyleSheets) {
         renderRoot.adoptedStyleSheets = [
           twSheet,
-          ...renderRoot.adoptedStyleSheets
+          ...renderRoot.adoptedStyleSheets,
+          ...constructorStylesheets
         ];
       } else {
-        renderRoot.adoptedStyleSheets = [twSheet];
+        renderRoot.adoptedStyleSheets = [twSheet, ...constructorStylesheets];
       }
       return renderRoot;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/elements",
-  "version": "0.15.0-beta.11",
+  "version": "0.15.0-beta.13",
   "description": "",
   "exports": {
     ".": {
@@ -27,7 +27,7 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@bramus/style-observer": "^1.3.0",
-    "@editframe/assets": "0.15.0-beta.11",
+    "@editframe/assets": "0.15.0-beta.13",
     "@lit/context": "^1.1.2",
     "@lit/task": "^1.0.1",
     "d3": "^7.9.0",

package/src/elements/EFMedia.ts

@@ -126,8 +126,14 @@ export class EFMedia extends EFTargetable(
   public trackFragmentIndexLoader = new Task(this, {
     args: () => [this.fragmentIndexPath(), this.fetch] as const,
     task: async ([fragmentIndexPath, fetch], { signal }) => {
-      const response = await fetch(fragmentIndexPath, { signal });
-      return (await response.json()) as Record<number, TrackFragmentIndex>;
+      try {
+        const response = await fetch(fragmentIndexPath, { signal });
+
+        return (await response.json()) as Record<number, TrackFragmentIndex>;
+      } catch (error) {
+        log("Failed to load track fragment index", error);
+        return undefined;
+      }
     },
     onComplete: () => {
       this.requestUpdate("ownCurrentTimeMs");

package/src/gui/TWMixin.ts

@@ -1,4 +1,4 @@
-import type { LitElement } from "lit";
+import type { CSSResult, LitElement } from "lit";
 // @ts-expect-error cannot figure out how to declare this module as a string
 import twStyle from "./TWMixin.css?inline";
 
@@ -21,13 +21,30 @@ export function TWMixin<T extends new (...args: any[]) => LitElement>(Base: T) {
           "twSheet not found. Probable cause: CSSStyleSheet not supported in this environment",
         );
       }
+
+      const constructorStylesheets: CSSStyleSheet[] = [];
+      const constructorStyles = (("styles" in this.constructor &&
+        this.constructor.styles) ||
+        []) as CSSResult | CSSResult[];
+
+      if (Array.isArray(constructorStyles)) {
+        for (const item of constructorStyles) {
+          if (item.styleSheet) {
+            constructorStylesheets.push(item.styleSheet);
+          }
+        }
+      } else if (constructorStyles.styleSheet) {
+        constructorStylesheets.push(constructorStyles.styleSheet);
+      }
+
       if (renderRoot?.adoptedStyleSheets) {
         renderRoot.adoptedStyleSheets = [
           twSheet,
           ...renderRoot.adoptedStyleSheets,
+          ...constructorStylesheets,
         ];
       } else {
-        renderRoot.adoptedStyleSheets = [twSheet];
+        renderRoot.adoptedStyleSheets = [twSheet, ...constructorStylesheets];
       }
       return renderRoot;
     }