From 3be8f6e98990f7e8a3af11400bbecaecddda336c Mon Sep 17 00:00:00 2001
From: Nick Senger <nicks@lich.io>
Date: Tue, 10 May 2022 17:18:08 -0700
Subject: fix: prevent building overlay with stale layout

---
 lazy/src/pure/component.rs | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'lazy/src/pure/component.rs')

diff --git a/lazy/src/pure/component.rs b/lazy/src/pure/component.rs
index 2971d2b7..bf6ff908 100644
--- a/lazy/src/pure/component.rs
+++ b/lazy/src/pure/component.rs
@@ -415,6 +415,35 @@ where
         let mut local_messages = Vec::new();
         let mut local_shell = Shell::new(&mut local_messages);
 
+        if self
+            .overlay
+            .as_ref()
+            .and_then(|overlay| overlay.borrow_overlay().as_ref())
+            .is_none()
+        {
+            let overlay = self.overlay.take().unwrap().into_heads();
+
+            self.overlay = Some(
+                OverlayBuilder {
+                    instance: overlay.instance,
+                    instance_ref_builder: |instance| instance.state.borrow(),
+                    tree: overlay.tree,
+                    types: PhantomData,
+                    overlay_builder: |instance, tree| {
+                        instance
+                            .as_ref()
+                            .unwrap()
+                            .borrow_element()
+                            .as_ref()
+                            .unwrap()
+                            .as_widget()
+                            .overlay(&mut tree.children[0], layout, renderer)
+                    },
+                }
+                .build(),
+            );
+        }
+
         let event_status = self
             .with_overlay_mut_maybe(|overlay| {
                 overlay.on_event(
@@ -464,16 +493,7 @@ where
                     instance_ref_builder: |instance| instance.state.borrow(),
                     tree: overlay.tree,
                     types: PhantomData,
-                    overlay_builder: |instance, tree| {
-                        instance
-                            .as_ref()
-                            .unwrap()
-                            .borrow_element()
-                            .as_ref()
-                            .unwrap()
-                            .as_widget()
-                            .overlay(&mut tree.children[0], layout, renderer)
-                    },
+                    overlay_builder: |_, _| None,
                 }
                 .build(),
             );
-- 
cgit