fix: load popup styles asap

samuelmaddock · Jul 7, 2020 · 38e31c5 · 38e31c5
1 parent 28aa1fe
commit 38e31c5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/metastream-app/src/components/Popup.tsx b/packages/metastream-app/src/components/Popup.tsx
@@ -187,10 +187,12 @@ export class PopupWindow extends Component<Props, State> {
       mediaPopupReady: Boolean(PopupWindow.mediaWindowRef && !PopupWindow.mediaWindowRef.closed)
     })
 
+    if (this.stylesheetObserver) {
+      this.stylesheetObserver.disconnect()
+    }
+
     this.stylesheetObserver = new MutationObserver(this.onHeadMutation)
-    this.stylesheetObserver.observe(document.head, {
-      childList: true
-    })
+    this.stylesheetObserver.observe(document.head, { childList: true })
 
     this.copyStyleSheets()
   }
@@ -260,6 +262,7 @@ export class PopupWindow extends Component<Props, State> {
     }
 
     if (windowRef) {
+      windowRef.addEventListener('DOMContentLoaded', this.onWindowLoad)
       windowRef.addEventListener('load', this.onWindowLoad)
       PopupWindow.remoteWindowRef = windowRef
     }