From 42316d51cd5fafce3e29f5d44353630efd22f1b3 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 17 Jun 2021 13:20:29 +0100
Subject: [PATCH] Key client layout component to ensure fully remounting when
 swapping layouts in the builder preview

---
 packages/client/src/components/ClientApp.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 86e50c9601..5e0efe5451 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -65,7 +65,9 @@
   >
     <Provider key="user" data={$authStore} {actions}>
       <div id="app-root">
-        <Component instance={$screenStore.activeLayout.props} />
+        {#key $screenStore.activeLayout._id}
+          <Component instance={$screenStore.activeLayout.props} />
+        {/key}
       </div>
       <NotificationDisplay />
       <!-- Key block needs to be outside the if statement or it breaks -->