From d372a0a6946d67f699e5e6ed0c05c722f58cdb22 Mon Sep 17 00:00:00 2001
From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
Date: Sat, 11 Oct 2025 19:30:15 -0400
Subject: [PATCH] Ensure VideoModal applies design system mode

---
 js/ui/components/VideoModal.js           |  6 +++
 tests/video-modal-accessibility.test.mjs | 63 +++++++++++++++++++++---
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/js/ui/components/VideoModal.js b/js/ui/components/VideoModal.js
index a5ca2734..aef1231e 100644
--- a/js/ui/components/VideoModal.js
+++ b/js/ui/components/VideoModal.js
@@ -1,5 +1,6 @@
 import { createModalAccessibility } from "./modalAccessibility.js";
 import positionFloatingPanel from "../utils/positionFloatingPanel.js";
+import { applyDesignSystemAttributes } from "../../designSystem.js";
 
 export class VideoModal {
   constructor({
@@ -163,6 +164,9 @@ export class VideoModal {
 
     const existing = this.document.getElementById("playerModal");
     if (existing) {
+      if (this.playerModal === existing && this.loaded) {
+        return this.playerModal;
+      }
       this.hydrate(existing);
       this.loaded = true;
       return this.playerModal;
@@ -194,6 +198,8 @@ export class VideoModal {
       throw new Error("Player modal root not found in markup.");
     }
 
+    applyDesignSystemAttributes(playerModal);
+
     this.hydrate(playerModal);
     this.loaded = true;
     return this.playerModal;
diff --git a/tests/video-modal-accessibility.test.mjs b/tests/video-modal-accessibility.test.mjs
index f2144d03..fe45ae72 100644
--- a/tests/video-modal-accessibility.test.mjs
+++ b/tests/video-modal-accessibility.test.mjs
@@ -15,10 +15,11 @@ const modalMarkupPromise = readFile(
   "utf8"
 );
 
-async function setupModal({ designSystemEnabled = false } = {}) {
+async function setupModal({ designSystemEnabled = false, lazyLoad = false } = {}) {
   const markup = await modalMarkupPromise;
+  const modalMarkup = lazyLoad ? "" : markup;
   const dom = new JSDOM(
-    `<!DOCTYPE html><html><body><button id="trigger" type="button">Open modal</button><div id="modalContainer">${markup}</div></body></html>`,
+    `<!DOCTYPE html><html><body><button id="trigger" type="button">Open modal</button><div id="modalContainer">${modalMarkup}</div></body></html>`,
     { url: "https://example.com", pretendToBeVisual: true }
   );
 
@@ -42,6 +43,34 @@ async function setupModal({ designSystemEnabled = false } = {}) {
   setFeatureDesignSystemEnabled(designSystemEnabled);
   applyDesignSystemAttributes(document);
 
+  let restoreFetch = null;
+  if (lazyLoad) {
+    const originalFetch = globalThis.fetch;
+    globalThis.fetch = async (resource, init) => {
+      const url = typeof resource === "string" ? resource : resource?.url;
+      if (url && url.endsWith("components/video-modal.html")) {
+        return {
+          ok: true,
+          status: 200,
+          async text() {
+            return markup;
+          },
+        };
+      }
+      if (typeof originalFetch === "function") {
+        return originalFetch(resource, init);
+      }
+      throw new Error(`Unexpected fetch request in tests: ${String(url || resource)}`);
+    };
+    restoreFetch = () => {
+      if (originalFetch) {
+        globalThis.fetch = originalFetch;
+      } else {
+        delete globalThis.fetch;
+      }
+    };
+  }
+
   const modal = new VideoModal({
     removeTrackingScripts: () => {},
     setGlobalModalState: () => {},
@@ -49,10 +78,14 @@ async function setupModal({ designSystemEnabled = false } = {}) {
     logger: console,
   });
 
-  const playerModal = document.querySelector("#playerModal");
-  assert.ok(playerModal, "player modal markup should exist");
-  modal.hydrate(playerModal);
-  applyDesignSystemAttributes(playerModal);
+  let playerModal = document.querySelector("#playerModal");
+  if (playerModal) {
+    modal.hydrate(playerModal);
+  } else {
+    await modal.load();
+    playerModal = modal.getRoot();
+    assert.ok(playerModal, "player modal markup should exist after load");
+  }
 
   const trigger = document.getElementById("trigger");
   assert.ok(trigger, "trigger button should exist");
@@ -77,6 +110,9 @@ async function setupModal({ designSystemEnabled = false } = {}) {
     delete globalThis.location;
     delete globalThis.KeyboardEvent;
     delete globalThis.MouseEvent;
+    if (restoreFetch) {
+      restoreFetch();
+    }
   };
 
   return { window, document, modal, playerModal, trigger, cleanup };
@@ -275,4 +311,19 @@ for (const designSystemEnabled of [false, true]) {
       modal.close();
     }
   );
+
+  if (designSystemEnabled) {
+    test(
+      `[${modeLabel}] video modal inherits design system mode when loaded dynamically`,
+      async (t) => {
+        const { playerModal, cleanup } = await setupModal({
+          designSystemEnabled,
+          lazyLoad: true,
+        });
+        t.after(cleanup);
+
+        assert.strictEqual(playerModal.getAttribute("data-ds"), "new");
+      }
+    );
+  }
 }