From 1a1d7c4fd873bf600661000689a0e7ad2070262d Mon Sep 17 00:00:00 2001 From: Seth Trowbridge Date: Tue, 31 Oct 2023 09:45:26 -0400 Subject: [PATCH] fix config merging --- run-browser.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/run-browser.tsx b/run-browser.tsx index 8e47d2c..76fbea3 100644 --- a/run-browser.tsx +++ b/run-browser.tsx @@ -10,17 +10,15 @@ const Configure = hash: false } as TW.TwindUserConfig; -export const Shadow =(inElement:HTMLElement, inConfig?:TW.TwindUserConfig)=> +export const Shadow =(inElement:HTMLElement, inConfig:TW.TwindUserConfig)=> { - const merge = inConfig ? {...Configure, ...inConfig} : Configure; - const ShadowDOM = inElement.attachShadow({ mode: "open" }); const ShadowDiv = document.createElement("div"); const ShadowCSS = document.createElement("style"); ShadowDOM.append(ShadowCSS); ShadowDOM.append(ShadowDiv); - TW.observe(TW.twind(merge, TW.cssom(ShadowCSS)), ShadowDiv); + TW.observe(TW.twind(inConfig, TW.cssom(ShadowCSS)), ShadowDiv); return ShadowDiv; }; @@ -40,13 +38,15 @@ export default async(inSelector:string, inModulePath:string, inMemberApp="defaul const module = await import(inModulePath); + const merge = inMemberCSS ? {...Configure, ...module[inMemberCSS]} : Configure; + if(inShadow) { - dom = Shadow(dom as HTMLElement, module[inMemberCSS]); + dom = Shadow(dom as HTMLElement, merge); } else { - TW.install(Configure); + TW.install(merge); } const app = React.createElement(()=> React.createElement(module[inMemberApp], null), null); -- 2.34.1