Merge branch 'main' into picker

crates/workspace2/src/modal_layer.rs

@@ -28,10 +28,6 @@ struct ToggleModal {
     name: String,
 }
 
-// complete change of plan?
-// on_action(ToggleModal{ name})
-// register_modal(name, |workspace, cx| { ... })
-
 impl ModalRegistry {
     pub fn register_modal<A: 'static, V, B>(&mut self, action: A, build_view: B)
     where
@@ -40,12 +36,10 @@ impl ModalRegistry {
     {
         let build_view = Arc::new(build_view);
 
-        dbg!("yonder");
         self.registered_modals.push((
             TypeId::of::<A>(),
             Box::new(move |mut div| {
                 let build_view = build_view.clone();
-                dbg!("this point");
 
                 div.on_action(
                     move |workspace: &mut Workspace, event: &A, cx: &mut ViewContext<Workspace>| {
@@ -67,9 +61,7 @@ impl ModalLayer {
         Self { open_modal: None }
     }
 
-    pub fn render(&self, cx: &ViewContext<Workspace>) -> impl Component<Workspace> {
-        dbg!("rendering ModalLayer");
-
+    pub fn render(&self, workspace: &Workspace, cx: &ViewContext<Workspace>) -> Div<Workspace> {
         let mut div = div();
 
         // div, c workspace.toggle_modal()div.on_action()) {

crates/workspace2/src/workspace2.rs

@@ -3707,7 +3707,9 @@ impl Render for Workspace {
             .bg(cx.theme().colors().background)
             .child(self.render_titlebar(cx))
             .child(
-                div()
+                self.modal_layer
+                    .read(cx)
+                    .render(self, cx)
                     .flex_1()
                     .w_full()
                     .flex()
@@ -3840,8 +3842,6 @@ impl Render for Workspace {
                               //         .on_click(Arc::new(|workspace, cx| workspace.toggle_debug(cx))),
                               // ),
             )
-            //     .child(self.modal_layer.clone())
-            .child(self.modal_layer.read(cx).render(cx))
     }
 }