even more robust style injecting

fullcalendar · May 24, 2023 · 0088523 · 0088523
1 parent 8a03db7
commit 0088523
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/packages/core/src/styleUtils.ts b/packages/core/src/styleUtils.ts
@@ -13,11 +13,7 @@ export function ensureElHasStyles(el: HTMLElement): void {
   registerStylesRoot(el.getRootNode() as ParentNode)
 }
 
-function registerStylesRoot(
-  rootNode: ParentNode,
-  parentEl: ParentNode = rootNode,
-  insertBefore: Node | null = parentEl.firstChild,
-): void {
+function registerStylesRoot(rootNode: ParentNode): void {
   let styleEl: HTMLStyleElement = styleEls.get(rootNode)
 
   if (!styleEl || !styleEl.isConnected) {
@@ -32,6 +28,11 @@ function registerStylesRoot(
         styleEl.nonce = nonce
       }
 
+      const parentEl = rootNode === document ? document.head : rootNode
+      const insertBefore = rootNode === document
+        ? parentEl.querySelector('script,link[rel=stylesheet],link[as=style],style')
+        : parentEl.firstChild
+
       parentEl.insertBefore(styleEl, insertBefore)
     }
 
@@ -93,9 +94,5 @@ function queryNonceValue() {
 // -------------------------------------------------------------------------------------------------
 
 if (typeof document !== 'undefined') {
-  registerStylesRoot(
-    document,
-    document.head,
-    document.head.querySelector('script,link,style'), // if none, will put at end of <head>
-  )
+  registerStylesRoot(document)
 }