From 095c8fcdf1b6c47dc5b3e7bab500cdf09f4132b0 Mon Sep 17 00:00:00 2001 From: Alex Yuly Date: Wed, 23 Oct 2024 11:48:48 -0700 Subject: [PATCH] Instantiate component enhancements on load event, not DOMContentLoaded --- main.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/main.js b/main.js index be7272f..e2a7acd 100644 --- a/main.js +++ b/main.js @@ -296,11 +296,12 @@ globalThis.ViewScript.components["${componentId}"] const scriptData = JSON.stringify(componentData); const minifiedScript = await minify(` -addEventListener("DOMContentLoaded", function () { +addEventListener("load", function () { new (globalThis.ViewScript.components["${componentId}"].default)(${scriptData}); });`); scriptElement.textContent = minifiedScript.code; + scriptElement.className = componentId; dom.window.document.head.appendChild(scriptElement); } @@ -320,10 +321,6 @@ exports.getComponentFromFs = async function getComponentFromFs( return cachedComponent; } - - console.log( - `[viewscript-server] getComponentFromFs ${componentDir} from disk` - ); } const settingsFilePath = resolve(baseDir, componentDir, "settings.yaml"); @@ -352,6 +349,10 @@ exports.getComponentFromFs = async function getComponentFromFs( getComponentFromFsCache.set(componentDir, component); } + console.log( + `[viewscript-server] getComponentFromFs ${componentDir} from disk` + ); + return component; }; @@ -387,8 +388,8 @@ exports.renderComponent = async function renderComponent( const componentContext = { ...context, - renderComponent, componentSettings, + renderComponent, }; applyDataToDomElement(