From 57aa63a2d6dbfd38f9a18dfbb19e2ea8a39145bb Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Tue, 25 Jan 2022 11:21:42 +0000
Subject: [PATCH] Don't render the active client app screen until the router is
 loaded to avoid a wasted render

---
 packages/client/src/components/Screen.svelte | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/Screen.svelte b/packages/client/src/components/Screen.svelte
index 4878df157f..17f068e04f 100644
--- a/packages/client/src/components/Screen.svelte
+++ b/packages/client/src/components/Screen.svelte
@@ -20,8 +20,10 @@
 </script>
 
 <!-- Ensure to fully remount when screen changes -->
-{#key screenDefinition?._id}
-  <Provider key="url" data={params}>
-    <Component isScreen instance={screenDefinition} />
-  </Provider>
-{/key}
+{#if $routeStore.routerLoaded}
+  {#key screenDefinition?._id}
+    <Provider key="url" data={params}>
+      <Component isScreen instance={screenDefinition} />
+    </Provider>
+  {/key}
+{/if}