@vouchfor/embeds 0.0.0-experiment.bdda3d0 → 0.0.0-experiment.d900f80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vouchfor/embeds",
-  "version": "0.0.0-experiment.bdda3d0",
+  "version": "0.0.0-experiment.d900f80",
   "license": "MIT",
   "author": "Aaron Williams",
   "main": "dist/es/embeds.js",
@@ -26,7 +26,7 @@
     "lint:staged": "lint-staged",
     "prepublishOnly": "yarn build",
     "size": "size-limit",
-    "storybook": "yarn prebuild && storybook dev -p 6006",
+    "storybook": "yarn prebuild && storybook dev -p 6007",
     "prebuild": "yarn build:deps && yarn generate:manifest",
     "test": "true"
   },
@@ -35,8 +35,8 @@
     "**/*.{md,json,yml}": "prettier --write"
   },
   "dependencies": {
-    "@lit/task": "1.0.0",
-    "@vouchfor/media-player": "0.0.0-experiment.bdda3d0",
+    "@lit/task": "^1.0.0",
+    "@vouchfor/media-player": "0.0.0-experiment.d900f80",
     "uuid": "^9.0.1"
   },
   "peerDependencies": {

package/src/components/Embed/controllers/fetcher.ts

@@ -1,7 +1,6 @@
 import { Task } from '@lit/task';
 
 import type { Embed, EmbedProps } from '..';
-import type { TemplateInstance } from '@vouchfor/canvas-video';
 import type { ReactiveControllerHost } from 'lit';
 import type { Environment } from '~/utils/env';
 
@@ -21,8 +20,6 @@ class FetcherController {
   host: EmbedHost;
 
   private _fetching = false;
-  private _vouch?: EmbedProps['data'];
-  private _template?: TemplateInstance;
 
   set fetching(value) {
     if (this._fetching !== value) {
@@ -34,50 +31,22 @@ class FetcherController {
     return this._fetching;
   }
 
-  set vouch(value) {
-    if (this._vouch !== value) {
-      this._vouch = value;
-      this.host.requestUpdate();
-    }
-  }
-  get vouch() {
-    return this._vouch;
-  }
-
-  set template(value) {
-    if (this._template !== value) {
-      this._template = value;
-      this.host.requestUpdate();
-    }
-  }
-  get template() {
-    return this._template;
-  }
-
-  private async getVouch(env: Environment, apiKey: string, vouchId?: string) {
+  private async getVouch(env: Environment, apiKey: string, vouchId: string) {
     const { embedApiUrl } = getEnvUrls(env);
 
-    if (vouchId) {
-      return fetch(`${embedApiUrl}/vouches/${vouchId}`, {
-        method: 'GET',
-        headers: [['X-Api-Key', apiKey]]
-      }).then((response) => response.json());
-    }
-
-    return null;
+    return fetch(`${embedApiUrl}/vouches/${vouchId}`, {
+      method: 'GET',
+      headers: [['X-Api-Key', apiKey]]
+    }).then((response) => response.json());
   }
 
-  private async getTemplate(env: Environment, apiKey: string, templateId?: string) {
+  private async getTemplate(env: Environment, apiKey: string, templateId: string) {
     const { embedApiUrl } = getEnvUrls(env);
 
-    if (templateId) {
-      return fetch(`${embedApiUrl}/templates/${templateId}`, {
-        method: 'GET',
-        headers: [['X-Api-Key', apiKey]]
-      }).then((response) => response.json());
-    }
-
-    return null;
+    return fetch(`${embedApiUrl}/templates/${templateId}`, {
+      method: 'GET',
+      headers: [['X-Api-Key', apiKey]]
+    }).then((response) => response.json());
   }
 
   constructor(host: EmbedHost) {
@@ -86,22 +55,26 @@ class FetcherController {
       this.host,
       async ([env, apiKey, data, vouchId, templateId]: TaskDeps) => {
         try {
-          this.vouch = undefined;
-          this.template = undefined;
+          host.vouch = undefined;
+          host.template = undefined;
 
           if (data) {
-            const template = await this.getTemplate(env, apiKey, templateId);
-            this.vouch = data;
-            this.template = data?.settings?.template?.instance ?? template;
+            let template;
+            if (templateId) {
+              this.fetching = true;
+              template = await this.getTemplate(env, apiKey, templateId);
+            }
+            host.vouch = data;
+            host.template = template ?? data?.settings?.template?.instance;
           } else if (vouchId) {
             this.fetching = true;
 
             const [vouch, template] = await Promise.all([
               this.getVouch(env, apiKey, vouchId),
-              this.getTemplate(env, apiKey, templateId)
+              templateId ? this.getTemplate(env, apiKey, templateId) : null
             ]);
-            this.vouch = vouch;
-            this.template = vouch?.settings?.template?.instance ?? template;
+            host.vouch = vouch;
+            host.template = template ?? vouch?.settings?.template?.instance;
           }
         } finally {
           this.fetching = false;

package/src/components/Embed/index.ts

@@ -1,5 +1,5 @@
 import { html, LitElement } from 'lit';
-import { customElement, property } from 'lit/decorators.js';
+import { customElement, property, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { createRef, ref } from 'lit/directives/ref.js';
 
@@ -69,13 +69,8 @@ class Embed extends LitElement {
   // @ts-ignore
   private _trackingController = new TrackingController(this);
 
-  get vouch() {
-    return this._fetcherController.vouch;
-  }
-
-  get template(): TemplateInstance | undefined {
-    return this._fetcherController.template;
-  }
+  @state() vouch: EmbedProps['data'];
+  @state() template: TemplateInstance | undefined;
 
   get fetching() {
     return this._fetcherController.fetching;