Reorganize element-related traits

crates/collab_ui2/src/collab_titlebar_item.rs

@@ -31,7 +31,7 @@ use std::sync::Arc;
 use call::ActiveCall;
 use client::{Client, UserStore};
 use gpui::{
-    div, px, rems, AppContext, Div, InteractiveElement, Model, ParentElement, Render, RenderOnce,
+    div, px, rems, AppContext, Div, InteractiveElement, IntoElement, Model, ParentElement, Render,
     Stateful, StatefulInteractiveElement, Styled, Subscription, ViewContext, VisualContext,
     WeakView, WindowBounds,
 };

crates/diagnostics2/src/diagnostics.rs

@@ -14,8 +14,8 @@ use editor::{
 use futures::future::try_join_all;
 use gpui::{
     actions, div, AnyElement, AnyView, AppContext, Context, Div, EventEmitter, FocusEvent,
-    FocusHandle, Focusable, FocusableElement, FocusableView, InteractiveElement, Model,
+    FocusHandle, Focusable, FocusableElement, FocusableView, InteractiveElement, IntoElement,
-    ParentElement, Render, RenderOnce, SharedString, Styled, Subscription, Task, View, ViewContext,
+    Model, ParentElement, Render, SharedString, Styled, Subscription, Task, View, ViewContext,
     VisualContext, WeakView, WindowContext,
 };
 use language::{
@@ -792,14 +792,14 @@ fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock {
             .when_some(diagnostic.code.as_ref(), |stack, code| {
                 stack.child(Label::new(code.clone()))
             })
-            .render_into_any()
+            .into_any_element()
     })
 }
 
 pub(crate) fn render_summary(summary: &DiagnosticSummary) -> AnyElement {
     if summary.error_count == 0 && summary.warning_count == 0 {
         let label = Label::new("No problems");
-        label.render_into_any()
+        label.into_any_element()
     } else {
         h_stack()
             .bg(gpui::red())
@@ -807,7 +807,7 @@ pub(crate) fn render_summary(summary: &DiagnosticSummary) -> AnyElement {
             .child(Label::new(summary.error_count.to_string()))
             .child(IconElement::new(Icon::ExclamationTriangle))
             .child(Label::new(summary.warning_count.to_string()))
-            .render_into_any()
+            .into_any_element()
     }
 }
 

crates/editor2/src/editor.rs

@@ -40,9 +40,9 @@ use fuzzy::{StringMatch, StringMatchCandidate};
 use git::diff_hunk_to_display;
 use gpui::{
     actions, div, point, prelude::*, px, relative, rems, size, uniform_list, Action, AnyElement,
-    AppContext, AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Component, Context,
+    AppContext, AsyncWindowContext, BackgroundExecutor, Bounds, ClipboardItem, Context,
     EventEmitter, FocusHandle, FocusableView, FontFeatures, FontStyle, FontWeight, HighlightStyle,
-    Hsla, InputHandler, KeyContext, Model, MouseButton, ParentElement, Pixels, Render,
+    Hsla, InputHandler, KeyContext, Model, MouseButton, ParentElement, Pixels, Render, RenderOnce,
     SharedString, Styled, Subscription, Task, TextStyle, UniformListScrollHandle, View,
     ViewContext, VisualContext, WeakView, WhiteSpace, WindowContext,
 };
@@ -1373,7 +1373,7 @@ impl CompletionsMenu {
         .track_scroll(self.scroll_handle.clone())
         .with_width_from_item(widest_completion_ix);
 
-        list.render_into_any()
+        list.into_any_element()
         // todo!("multiline documentation")
         //     enum MultiLineDocumentation {}
 
@@ -1596,7 +1596,7 @@ impl CodeActionsMenu {
                 .max_by_key(|(_, action)| action.lsp_action.title.chars().count())
                 .map(|(ix, _)| ix),
         )
-        .render_into_any();
+        .into_any_element();
 
         if self.deployed_from_indicator {
             *cursor_position.column_mut() = 0;
@@ -7796,7 +7796,7 @@ impl Editor {
                                                     .clone(),
                                             },
                                         ))
-                                        .render_into_any()
+                                        .into_any_element()
                                 }
                             }),
                             disposition: BlockDisposition::Below,
@@ -10005,7 +10005,7 @@ pub fn diagnostic_block_renderer(diagnostic: Diagnostic, is_valid: bool) -> Rend
                 cx.write_to_clipboard(ClipboardItem::new(message.clone()));
             }))
             .tooltip(|cx| Tooltip::text("Copy diagnostic message", cx))
-            .render_into_any()
+            .into_any_element()
     })
 }
 

crates/editor2/src/element.rs

@@ -19,8 +19,8 @@ use anyhow::Result;
 use collections::{BTreeMap, HashMap};
 use gpui::{
     div, point, px, relative, size, transparent_black, Action, AnyElement, AvailableSpace,
-    BorrowWindow, Bounds, Component, ContentMask, Corners, DispatchPhase, Edges, Element,
+    BorrowWindow, Bounds, ContentMask, Corners, DispatchPhase, Edges, Element, ElementId,
-    ElementId, ElementInputHandler, Entity, EntityId, Hsla, InteractiveElement, LineLayout,
+    ElementInputHandler, Entity, EntityId, Hsla, InteractiveElement, IntoElement, LineLayout,
     MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, RenderOnce,
     ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement, Style, Styled,
     TextRun, TextStyle, View, ViewContext, WeakView, WindowContext, WrappedLine,
@@ -663,7 +663,7 @@ impl EditorElement {
 
         for (ix, fold_indicator) in layout.fold_indicators.drain(..).enumerate() {
             if let Some(mut fold_indicator) = fold_indicator {
-                let mut fold_indicator = fold_indicator.render_into_any();
+                let mut fold_indicator = fold_indicator.into_any_element();
                 let available_space = size(
                     AvailableSpace::MinContent,
                     AvailableSpace::Definite(line_height * 0.55),
@@ -684,7 +684,7 @@ impl EditorElement {
         }
 
         if let Some(indicator) = layout.code_actions_indicator.take() {
-            let mut button = indicator.button.render_into_any();
+            let mut button = indicator.button.into_any_element();
             let available_space = size(
                 AvailableSpace::MinContent,
                 AvailableSpace::Definite(line_height),
@@ -2653,14 +2653,14 @@ impl Element for EditorElement {
     }
 }
 
-impl RenderOnce for EditorElement {
+impl IntoElement for EditorElement {
     type Element = Self;
 
     fn element_id(&self) -> Option<gpui::ElementId> {
         self.editor.element_id()
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/file_finder2/src/file_finder.rs

@@ -3,7 +3,7 @@ use editor::{scroll::autoscroll::Autoscroll, Bias, Editor};
 use fuzzy::{CharBag, PathMatch, PathMatchCandidate};
 use gpui::{
     actions, div, AppContext, Div, EventEmitter, FocusHandle, FocusableView, InteractiveElement,
-    Manager, Model, ParentElement, Render, RenderOnce, Styled, Task, View, ViewContext,
+    IntoElement, Manager, Model, ParentElement, Render, Styled, Task, View, ViewContext,
     VisualContext, WeakView,
 };
 use picker::{Picker, PickerDelegate};

crates/gpui2/src/element.rs

@@ -12,15 +12,15 @@ pub trait Render: 'static + Sized {
     fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element;
 }
 
-pub trait RenderOnce: Sized {
+pub trait IntoElement: Sized {
     type Element: Element + 'static;
 
     fn element_id(&self) -> Option<ElementId>;
 
-    fn render_once(self) -> Self::Element;
+    fn into_element(self) -> Self::Element;
 
-    fn render_into_any(self) -> AnyElement {
+    fn into_any_element(self) -> AnyElement {
-        self.render_once().into_any()
+        self.into_element().into_any()
     }
 
     fn draw<T, R>(
@@ -33,7 +33,7 @@ pub trait RenderOnce: Sized {
     where
         T: Clone + Default + Debug + Into<AvailableSpace>,
     {
-        let element = self.render_once();
+        let element = self.into_element();
         let element_id = element.element_id();
         let element = DrawableElement {
             element: Some(element),
@@ -57,7 +57,7 @@ pub trait RenderOnce: Sized {
     fn map<U>(self, f: impl FnOnce(Self) -> U) -> U
     where
         Self: Sized,
-        U: RenderOnce,
+        U: IntoElement,
     {
         f(self)
     }
@@ -83,7 +83,7 @@ pub trait RenderOnce: Sized {
     }
 }
 
-pub trait Element: 'static + RenderOnce {
+pub trait Element: 'static + IntoElement {
     type State: 'static;
 
     fn layout(
@@ -99,30 +99,30 @@ pub trait Element: 'static + RenderOnce {
     }
 }
 
-pub trait Component: 'static {
+pub trait RenderOnce: 'static {
-    type Rendered: RenderOnce;
+    type Rendered: IntoElement;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered;
 }
 
-pub struct CompositeElement<C> {
+pub struct Component<C> {
     component: Option<C>,
 }
 
-pub struct CompositeElementState<C: Component> {
+pub struct CompositeElementState<C: RenderOnce> {
-    rendered_element: Option<<C::Rendered as RenderOnce>::Element>,
+    rendered_element: Option<<C::Rendered as IntoElement>::Element>,
-    rendered_element_state: <<C::Rendered as RenderOnce>::Element as Element>::State,
+    rendered_element_state: <<C::Rendered as IntoElement>::Element as Element>::State,
 }
 
-impl<C> CompositeElement<C> {
+impl<C> Component<C> {
     pub fn new(component: C) -> Self {
-        CompositeElement {
+        Component {
             component: Some(component),
         }
     }
 }
 
-impl<C: Component> Element for CompositeElement<C> {
+impl<C: RenderOnce> Element for Component<C> {
     type State = CompositeElementState<C>;
 
     fn layout(
@@ -130,7 +130,7 @@ impl<C: Component> Element for CompositeElement<C> {
         state: Option<Self::State>,
         cx: &mut WindowContext,
     ) -> (LayoutId, Self::State) {
-        let mut element = self.component.take().unwrap().render(cx).render_once();
+        let mut element = self.component.take().unwrap().render(cx).into_element();
         let (layout_id, state) = element.layout(state.map(|s| s.rendered_element_state), cx);
         let state = CompositeElementState {
             rendered_element: Some(element),
@@ -148,14 +148,14 @@ impl<C: Component> Element for CompositeElement<C> {
     }
 }
 
-impl<C: Component> RenderOnce for CompositeElement<C> {
+impl<C: RenderOnce> IntoElement for Component<C> {
     type Element = Self;
 
     fn element_id(&self) -> Option<ElementId> {
         None
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }
@@ -166,23 +166,20 @@ pub struct GlobalElementId(SmallVec<[ElementId; 32]>);
 pub trait ParentElement {
     fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]>;
 
-    fn child(mut self, child: impl RenderOnce) -> Self
+    fn child(mut self, child: impl IntoElement) -> Self
     where
         Self: Sized,
     {
-        self.children_mut().push(child.render_once().into_any());
+        self.children_mut().push(child.into_element().into_any());
         self
     }
 
-    fn children(mut self, children: impl IntoIterator<Item = impl RenderOnce>) -> Self
+    fn children(mut self, children: impl IntoIterator<Item = impl IntoElement>) -> Self
     where
         Self: Sized,
     {
-        self.children_mut().extend(
+        self.children_mut()
-            children
+            .extend(children.into_iter().map(|child| child.into_any_element()));
-                .into_iter()
-                .map(|child| child.render_once().into_any()),
-        );
         self
     }
 }
@@ -486,14 +483,14 @@ impl Element for AnyElement {
     }
 }
 
-impl RenderOnce for AnyElement {
+impl IntoElement for AnyElement {
     type Element = Self;
 
     fn element_id(&self) -> Option<ElementId> {
         AnyElement::element_id(self)
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/gpui2/src/elements/div.rs

@@ -1,9 +1,9 @@
 use crate::{
     point, px, Action, AnyDrag, AnyElement, AnyTooltip, AnyView, AppContext, BorrowAppContext,
     BorrowWindow, Bounds, ClickEvent, DispatchPhase, Element, ElementId, FocusEvent, FocusHandle,
-    KeyContext, KeyDownEvent, KeyUpEvent, LayoutId, MouseButton, MouseDownEvent, MouseMoveEvent,
+    IntoElement, KeyContext, KeyDownEvent, KeyUpEvent, LayoutId, MouseButton, MouseDownEvent,
-    MouseUpEvent, ParentElement, Pixels, Point, Render, RenderOnce, ScrollWheelEvent, SharedString,
+    MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, Point, Render, ScrollWheelEvent,
-    Size, Style, StyleRefinement, Styled, Task, View, Visibility, WindowContext,
+    SharedString, Size, Style, StyleRefinement, Styled, Task, View, Visibility, WindowContext,
 };
 use collections::HashMap;
 use refineable::Refineable;
@@ -666,14 +666,14 @@ impl Element for Div {
     }
 }
 
-impl RenderOnce for Div {
+impl IntoElement for Div {
     type Element = Self;
 
     fn element_id(&self) -> Option<ElementId> {
         self.interactivity.element_id.clone()
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }
@@ -1278,7 +1278,7 @@ where
     }
 }
 
-impl<E> RenderOnce for Focusable<E>
+impl<E> IntoElement for Focusable<E>
 where
     E: Element,
 {
@@ -1288,7 +1288,7 @@ where
         self.element.element_id()
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self.element
     }
 }
@@ -1352,7 +1352,7 @@ where
     }
 }
 
-impl<E> RenderOnce for Stateful<E>
+impl<E> IntoElement for Stateful<E>
 where
     E: Element,
 {
@@ -1362,7 +1362,7 @@ where
         self.element.element_id()
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/gpui2/src/elements/img.rs

@@ -1,6 +1,6 @@
 use crate::{
-    Bounds, Element, InteractiveElement, InteractiveElementState, Interactivity, LayoutId, Pixels,
+    Bounds, Element, InteractiveElement, InteractiveElementState, Interactivity, IntoElement,
-    RenderOnce, SharedString, StyleRefinement, Styled, WindowContext,
+    LayoutId, Pixels, SharedString, StyleRefinement, Styled, WindowContext,
 };
 use futures::FutureExt;
 use util::ResultExt;
@@ -86,14 +86,14 @@ impl Element for Img {
     }
 }
 
-impl RenderOnce for Img {
+impl IntoElement for Img {
     type Element = Self;
 
     fn element_id(&self) -> Option<crate::ElementId> {
         self.interactivity.element_id.clone()
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/gpui2/src/elements/overlay.rs

@@ -2,8 +2,8 @@ use smallvec::SmallVec;
 use taffy::style::{Display, Position};
 
 use crate::{
-    point, AnyElement, BorrowWindow, Bounds, Element, LayoutId, ParentElement, Pixels, Point,
+    point, AnyElement, BorrowWindow, Bounds, Element, IntoElement, LayoutId, ParentElement, Pixels,
-    RenderOnce, Size, Style, WindowContext,
+    Point, Size, Style, WindowContext,
 };
 
 pub struct OverlayState {
@@ -151,14 +151,14 @@ impl Element for Overlay {
     }
 }
 
-impl RenderOnce for Overlay {
+impl IntoElement for Overlay {
     type Element = Self;
 
     fn element_id(&self) -> Option<crate::ElementId> {
         None
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/gpui2/src/elements/svg.rs

@@ -1,6 +1,6 @@
 use crate::{
     Bounds, Element, ElementId, InteractiveElement, InteractiveElementState, Interactivity,
-    LayoutId, Pixels, RenderOnce, SharedString, StyleRefinement, Styled, WindowContext,
+    IntoElement, LayoutId, Pixels, SharedString, StyleRefinement, Styled, WindowContext,
 };
 use util::ResultExt;
 
@@ -49,14 +49,14 @@ impl Element for Svg {
     }
 }
 
-impl RenderOnce for Svg {
+impl IntoElement for Svg {
     type Element = Self;
 
     fn element_id(&self) -> Option<ElementId> {
         self.interactivity.element_id.clone()
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/gpui2/src/elements/text.rs

@@ -1,5 +1,5 @@
 use crate::{
-    Bounds, Element, ElementId, LayoutId, Pixels, RenderOnce, SharedString, Size, TextRun,
+    Bounds, Element, ElementId, IntoElement, LayoutId, Pixels, SharedString, Size, TextRun,
     WhiteSpace, WindowContext, WrappedLine,
 };
 use anyhow::anyhow;
@@ -26,14 +26,14 @@ impl Element for &'static str {
     }
 }
 
-impl RenderOnce for &'static str {
+impl IntoElement for &'static str {
     type Element = Self;
 
     fn element_id(&self) -> Option<ElementId> {
         None
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }
@@ -57,14 +57,14 @@ impl Element for SharedString {
     }
 }
 
-impl RenderOnce for SharedString {
+impl IntoElement for SharedString {
     type Element = Self;
 
     fn element_id(&self) -> Option<ElementId> {
         None
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }
@@ -106,14 +106,14 @@ impl Element for StyledText {
     }
 }
 
-impl RenderOnce for StyledText {
+impl IntoElement for StyledText {
     type Element = Self;
 
     fn element_id(&self) -> Option<crate::ElementId> {
         None
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }
@@ -272,14 +272,14 @@ impl Element for InteractiveText {
     }
 }
 
-impl RenderOnce for InteractiveText {
+impl IntoElement for InteractiveText {
     type Element = Self;
 
     fn element_id(&self) -> Option<ElementId> {
         Some(self.element_id.clone())
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/gpui2/src/elements/uniform_list.rs

@@ -1,6 +1,6 @@
 use crate::{
     point, px, size, AnyElement, AvailableSpace, Bounds, Element, ElementId, InteractiveElement,
-    InteractiveElementState, Interactivity, LayoutId, Pixels, Point, Render, RenderOnce, Size,
+    InteractiveElementState, Interactivity, IntoElement, LayoutId, Pixels, Point, Render, Size,
     StyleRefinement, Styled, View, ViewContext, WindowContext,
 };
 use smallvec::SmallVec;
@@ -18,7 +18,7 @@ pub fn uniform_list<I, R, V>(
 ) -> UniformList
 where
     I: Into<ElementId>,
-    R: RenderOnce,
+    R: IntoElement,
     V: Render,
 {
     let id = id.into();
@@ -29,7 +29,7 @@ where
         view.update(cx, |this, cx| {
             f(this, range, cx)
                 .into_iter()
-                .map(|component| component.render_into_any())
+                .map(|component| component.into_any_element())
                 .collect()
         })
     };
@@ -243,14 +243,14 @@ impl Element for UniformList {
     }
 }
 
-impl RenderOnce for UniformList {
+impl IntoElement for UniformList {
     type Element = Self;
 
     fn element_id(&self) -> Option<crate::ElementId> {
         Some(self.id.clone())
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/gpui2/src/interactive.rs

@@ -1,6 +1,6 @@
 use crate::{
-    div, point, Div, Element, FocusHandle, Keystroke, Modifiers, Pixels, Point, Render, RenderOnce,
+    div, point, Div, Element, FocusHandle, IntoElement, Keystroke, Modifiers, Pixels, Point,
-    ViewContext,
+    Render, ViewContext,
 };
 use smallvec::SmallVec;
 use std::{any::Any, fmt::Debug, marker::PhantomData, ops::Deref, path::PathBuf};
@@ -64,7 +64,7 @@ pub struct Drag<S, R, V, E>
 where
     R: Fn(&mut V, &mut ViewContext<V>) -> E,
     V: 'static,
-    E: RenderOnce,
+    E: IntoElement,
 {
     pub state: S,
     pub render_drag_handle: R,
@@ -286,8 +286,8 @@ pub struct FocusEvent {
 #[cfg(test)]
 mod test {
     use crate::{
-        self as gpui, div, Div, FocusHandle, InteractiveElement, KeyBinding, Keystroke,
+        self as gpui, div, Div, FocusHandle, InteractiveElement, IntoElement, KeyBinding,
-        ParentElement, Render, RenderOnce, Stateful, TestAppContext, VisualContext,
+        Keystroke, ParentElement, Render, Stateful, TestAppContext, VisualContext,
     };
 
     struct TestView {
@@ -315,7 +315,7 @@ mod test {
                         div()
                             .key_context("nested")
                             .track_focus(&self.focus_handle)
-                            .render_once(),
+                            .into_element(),
                     ),
             )
         }

crates/gpui2/src/prelude.rs

@@ -1,5 +1,5 @@
 pub use crate::{
-    BorrowAppContext, BorrowWindow, Component, Context, Element, FocusableElement,
+    BorrowAppContext, BorrowWindow, Context, Element, FocusableElement, InteractiveElement,
-    InteractiveElement, ParentElement, Refineable, Render, RenderOnce, StatefulInteractiveElement,
+    IntoElement, ParentElement, Refineable, Render, RenderOnce, StatefulInteractiveElement, Styled,
-    Styled, VisualContext,
+    VisualContext,
 };

crates/gpui2/src/view.rs

@@ -1,7 +1,7 @@
 use crate::{
     private::Sealed, AnyElement, AnyModel, AnyWeakModel, AppContext, AvailableSpace, BorrowWindow,
-    Bounds, Element, ElementId, Entity, EntityId, Flatten, FocusHandle, FocusableView, LayoutId,
+    Bounds, Element, ElementId, Entity, EntityId, Flatten, FocusHandle, FocusableView, IntoElement,
-    Model, Pixels, Point, Render, RenderOnce, Size, ViewContext, VisualContext, WeakModel,
+    LayoutId, Model, Pixels, Point, Render, Size, ViewContext, VisualContext, WeakModel,
     WindowContext,
 };
 use anyhow::{Context, Result};
@@ -244,26 +244,26 @@ impl Element for AnyView {
     }
 }
 
-impl<V: 'static + Render> RenderOnce for View<V> {
+impl<V: 'static + Render> IntoElement for View<V> {
     type Element = View<V>;
 
     fn element_id(&self) -> Option<ElementId> {
         Some(self.model.entity_id.into())
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }
 
-impl RenderOnce for AnyView {
+impl IntoElement for AnyView {
     type Element = Self;
 
     fn element_id(&self) -> Option<ElementId> {
         Some(self.model.entity_id.into())
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/gpui2_macros/src/derive_component.rs

@@ -1,66 +0,0 @@
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{parse_macro_input, parse_quote, DeriveInput};
-
-pub fn derive_component(input: TokenStream) -> TokenStream {
-    let ast = parse_macro_input!(input as DeriveInput);
-    let name = &ast.ident;
-
-    let mut trait_generics = ast.generics.clone();
-    let view_type = if let Some(view_type) = specified_view_type(&ast) {
-        quote! { #view_type }
-    } else {
-        if let Some(first_type_param) = ast.generics.params.iter().find_map(|param| {
-            if let syn::GenericParam::Type(type_param) = param {
-                Some(type_param.ident.clone())
-            } else {
-                None
-            }
-        }) {
-            quote! { #first_type_param }
-        } else {
-            trait_generics.params.push(parse_quote! { V: 'static });
-            quote! { V }
-        }
-    };
-
-    let (impl_generics, _, where_clause) = trait_generics.split_for_impl();
-    let (_, ty_generics, _) = ast.generics.split_for_impl();
-
-    let expanded = quote! {
-        impl #impl_generics gpui::Component<#view_type> for #name #ty_generics #where_clause {
-            fn render(self) -> gpui::AnyElement<#view_type> {
-                (move |view_state: &mut #view_type, cx: &mut gpui::ViewContext<'_, #view_type>| self.render(view_state, cx))
-                    .render()
-            }
-        }
-    };
-
-    TokenStream::from(expanded)
-}
-
-fn specified_view_type(ast: &DeriveInput) -> Option<proc_macro2::Ident> {
-    let component_attr = ast
-        .attrs
-        .iter()
-        .find(|attr| attr.path.is_ident("component"))?;
-
-    if let Ok(syn::Meta::List(meta_list)) = component_attr.parse_meta() {
-        meta_list.nested.iter().find_map(|nested| {
-            if let syn::NestedMeta::Meta(syn::Meta::NameValue(nv)) = nested {
-                if nv.path.is_ident("view_type") {
-                    if let syn::Lit::Str(lit_str) = &nv.lit {
-                        return Some(
-                            lit_str
-                                .parse::<syn::Ident>()
-                                .expect("Failed to parse view_type"),
-                        );
-                    }
-                }
-            }
-            None
-        })
-    } else {
-        None
-    }
-}

crates/gpui2_macros/src/derive_into_element.rs

@@ -2,23 +2,23 @@ use proc_macro::TokenStream;
 use quote::quote;
 use syn::{parse_macro_input, DeriveInput};
 
-pub fn derive_render_once(input: TokenStream) -> TokenStream {
+pub fn derive_into_element(input: TokenStream) -> TokenStream {
     let ast = parse_macro_input!(input as DeriveInput);
     let type_name = &ast.ident;
     let (impl_generics, type_generics, where_clause) = ast.generics.split_for_impl();
 
     let gen = quote! {
-        impl #impl_generics gpui::RenderOnce for #type_name #type_generics
+        impl #impl_generics gpui::IntoElement for #type_name #type_generics
         #where_clause
         {
-            type Element = gpui::CompositeElement<Self>;
+            type Element = gpui::Component<Self>;
 
             fn element_id(&self) -> Option<ElementId> {
                 None
             }
 
-            fn render_once(self) -> Self::Element {
+            fn into_element(self) -> Self::Element {
-                gpui::CompositeElement::new(self)
+                gpui::Component::new(self)
             }
         }
     };

crates/gpui2_macros/src/gpui2_macros.rs

@@ -1,6 +1,5 @@
 mod action;
-mod derive_component;
+mod derive_into_element;
-mod derive_render_once;
 mod register_action;
 mod style_helpers;
 mod test;
@@ -17,14 +16,9 @@ pub fn register_action(attr: TokenStream, item: TokenStream) -> TokenStream {
     register_action::register_action_macro(attr, item)
 }
 
-#[proc_macro_derive(Component, attributes(component))]
+#[proc_macro_derive(IntoElement)]
-pub fn derive_component(input: TokenStream) -> TokenStream {
+pub fn derive_into_element(input: TokenStream) -> TokenStream {
-    derive_component::derive_component(input)
+    derive_into_element::derive_into_element(input)
-}
-
-#[proc_macro_derive(RenderOnce, attributes(view))]
-pub fn derive_render_once(input: TokenStream) -> TokenStream {
-    derive_render_once::derive_render_once(input)
 }
 
 #[proc_macro]

crates/picker2/src/picker2.rs

@@ -15,7 +15,7 @@ pub struct Picker<D: PickerDelegate> {
 }
 
 pub trait PickerDelegate: Sized + 'static {
-    type ListItem: RenderOnce;
+    type ListItem: IntoElement;
 
     fn match_count(&self) -> usize;
     fn selected_index(&self) -> usize;

crates/project_panel2/src/project_panel.rs

@@ -10,8 +10,8 @@ use anyhow::{anyhow, Result};
 use gpui::{
     actions, div, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext,
     ClipboardItem, Div, EventEmitter, FocusHandle, Focusable, FocusableView, InteractiveElement,
-    Model, MouseButton, MouseDownEvent, ParentElement, Pixels, Point, PromptLevel, Render,
+    IntoElement, Model, MouseButton, MouseDownEvent, ParentElement, Pixels, Point, PromptLevel,
-    RenderOnce, Stateful, StatefulInteractiveElement, Styled, Task, UniformListScrollHandle, View,
+    Render, Stateful, StatefulInteractiveElement, Styled, Task, UniformListScrollHandle, View,
     ViewContext, VisualContext as _, WeakView, WindowContext,
 };
 use menu::{Confirm, SelectNext, SelectPrev};

crates/search2/src/buffer_search.rs

@@ -10,9 +10,9 @@ use collections::HashMap;
 use editor::Editor;
 use futures::channel::oneshot;
 use gpui::{
-    actions, div, red, Action, AppContext, Div, EventEmitter, InteractiveElement as _,
+    actions, div, red, Action, AppContext, Div, EventEmitter, InteractiveElement as _, IntoElement,
-    ParentElement as _, Render, RenderOnce, Styled, Subscription, Task, View, ViewContext,
+    ParentElement as _, Render, Styled, Subscription, Task, View, ViewContext, VisualContext as _,
-    VisualContext as _, WindowContext,
+    WindowContext,
 };
 use project::search::SearchQuery;
 use serde::Deserialize;
@@ -538,7 +538,7 @@ impl BufferSearchBar {
         self.update_matches(cx)
     }
 
-    fn render_action_button(&self) -> impl RenderOnce {
+    fn render_action_button(&self) -> impl IntoElement {
         // let tooltip_style = theme.tooltip.clone();
 
         // let style = theme.search.action_button.clone();

crates/search2/src/search.rs

@@ -1,6 +1,6 @@
 use bitflags::bitflags;
 pub use buffer_search::BufferSearchBar;
-use gpui::{actions, Action, AppContext, RenderOnce};
+use gpui::{actions, Action, AppContext, IntoElement};
 pub use mode::SearchMode;
 use project::search::SearchQuery;
 use ui::ButtonVariant;
@@ -82,7 +82,7 @@ impl SearchOptions {
         options
     }
 
-    pub fn as_button(&self, active: bool) -> impl RenderOnce {
+    pub fn as_button(&self, active: bool) -> impl IntoElement {
         ui::IconButton::new(0, self.icon())
             .on_click({
                 let action = self.to_toggle_action();
@@ -95,7 +95,7 @@ impl SearchOptions {
     }
 }
 
-fn toggle_replace_button(active: bool) -> impl RenderOnce {
+fn toggle_replace_button(active: bool) -> impl IntoElement {
     // todo: add toggle_replace button
     ui::IconButton::new(0, ui::Icon::Replace)
         .on_click(|_, cx| {
@@ -109,7 +109,7 @@ fn toggle_replace_button(active: bool) -> impl RenderOnce {
 fn render_replace_button(
     action: impl Action + 'static + Send + Sync,
     icon: ui::Icon,
-) -> impl RenderOnce {
+) -> impl IntoElement {
     // todo: add tooltip
     ui::IconButton::new(0, icon).on_click(move |_, cx| {
         cx.dispatch_action(action.boxed_clone());

crates/search2/src/search_bar.rs

@@ -1,4 +1,4 @@
-use gpui::{MouseDownEvent, RenderOnce, WindowContext};
+use gpui::{IntoElement, MouseDownEvent, WindowContext};
 use ui::{Button, ButtonVariant, IconButton};
 
 use crate::mode::SearchMode;
@@ -7,7 +7,7 @@ pub(super) fn render_nav_button(
     icon: ui::Icon,
     _active: bool,
     on_click: impl Fn(&MouseDownEvent, &mut WindowContext) + 'static,
-) -> impl RenderOnce {
+) -> impl IntoElement {
     // let tooltip_style = cx.theme().tooltip.clone();
     // let cursor_style = if active {
     //     CursorStyle::PointingHand

crates/storybook2/src/stories/z_index.rs

@@ -1,4 +1,4 @@
-use gpui::{px, rgb, Div, Hsla, Render, RenderOnce};
+use gpui::{px, rgb, Div, Hsla, IntoElement, Render, RenderOnce};
 use story::Story;
 use ui::prelude::*;
 
@@ -76,12 +76,12 @@ trait Styles: Styled + Sized {
 
 impl Styles for Div {}
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 struct ZIndexExample {
     z_index: u32,
 }
 
-impl Component for ZIndexExample {
+impl RenderOnce for ZIndexExample {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/avatar.rs

@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use gpui::{img, Img, RenderOnce};
+use gpui::{img, Img, IntoElement};
 
 #[derive(Debug, Default, PartialEq, Clone)]
 pub enum Shape {
@@ -8,13 +8,13 @@ pub enum Shape {
     RoundedRectangle,
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct Avatar {
     src: SharedString,
     shape: Shape,
 }
 
-impl Component for Avatar {
+impl RenderOnce for Avatar {
     type Rendered = Img;
 
     fn render(self, _: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/button.rs

@@ -1,8 +1,8 @@
 use std::rc::Rc;
 
 use gpui::{
-    DefiniteLength, Div, Hsla, MouseButton, MouseDownEvent, RenderOnce, StatefulInteractiveElement,
+    DefiniteLength, Div, Hsla, IntoElement, MouseButton, MouseDownEvent,
-    WindowContext,
+    StatefulInteractiveElement, WindowContext,
 };
 
 use crate::prelude::*;
@@ -64,7 +64,7 @@ impl ButtonVariant {
     }
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct Button {
     disabled: bool,
     click_handler: Option<Rc<dyn Fn(&MouseDownEvent, &mut WindowContext)>>,
@@ -76,7 +76,7 @@ pub struct Button {
     color: Option<Color>,
 }
 
-impl Component for Button {
+impl RenderOnce for Button {
     type Rendered = gpui::Stateful<Div>;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {
@@ -207,12 +207,12 @@ impl Button {
     }
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct ButtonGroup {
     buttons: Vec<Button>,
 }
 
-impl Component for ButtonGroup {
+impl RenderOnce for ButtonGroup {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/checkbox.rs

@@ -1,4 +1,4 @@
-use gpui::{div, prelude::*, Div, Element, ElementId, RenderOnce, Styled, WindowContext};
+use gpui::{div, prelude::*, Div, Element, ElementId, IntoElement, Styled, WindowContext};
 
 use theme2::ActiveTheme;
 
@@ -11,7 +11,7 @@ pub type CheckHandler = Box<dyn Fn(&Selection, &mut WindowContext) + 'static>;
 /// Checkboxes are used for multiple choices, not for mutually exclusive choices.
 /// Each checkbox works independently from other checkboxes in the list,
 /// therefore checking an additional box does not affect any other selections.
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct Checkbox {
     id: ElementId,
     checked: Selection,
@@ -19,7 +19,7 @@ pub struct Checkbox {
     on_click: Option<CheckHandler>,
 }
 
-impl Component for Checkbox {
+impl RenderOnce for Checkbox {
     type Rendered = gpui::Stateful<Div>;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/context_menu.rs

@@ -5,8 +5,8 @@ use crate::{prelude::*, v_stack, List};
 use crate::{ListItem, ListSeparator, ListSubHeader};
 use gpui::{
     overlay, px, Action, AnchorCorner, AnyElement, AppContext, Bounds, ClickEvent, DispatchPhase,
-    Div, EventEmitter, FocusHandle, FocusableView, LayoutId, ManagedView, Manager, MouseButton,
+    Div, EventEmitter, FocusHandle, FocusableView, IntoElement, LayoutId, ManagedView, Manager,
-    MouseDownEvent, Pixels, Point, Render, RenderOnce, View, VisualContext,
+    MouseButton, MouseDownEvent, Pixels, Point, Render, View, VisualContext,
 };
 
 pub enum ContextMenuItem {
@@ -105,9 +105,9 @@ impl Render for ContextMenu {
                 .child(
                     List::new().children(self.items.iter().map(|item| match item {
                         ContextMenuItem::Separator(separator) => {
-                            separator.clone().render_into_any()
+                            separator.clone().into_any_element()
                         }
-                        ContextMenuItem::Header(header) => header.clone().render_into_any(),
+                        ContextMenuItem::Header(header) => header.clone().into_any_element(),
                         ContextMenuItem::Entry(entry, callback) => {
                             let callback = callback.clone();
                             let dismiss = cx.listener(|_, _, cx| cx.emit(Manager::Dismiss));
@@ -118,7 +118,7 @@ impl Render for ContextMenu {
                                     callback(event, cx);
                                     dismiss(event, cx)
                                 })
-                                .render_into_any()
+                                .into_any_element()
                         }
                     })),
                 ),
@@ -140,8 +140,8 @@ impl<M: ManagedView> MenuHandle<M> {
         self
     }
 
-    pub fn child<R: RenderOnce>(mut self, f: impl FnOnce(bool) -> R + 'static) -> Self {
+    pub fn child<R: IntoElement>(mut self, f: impl FnOnce(bool) -> R + 'static) -> Self {
-        self.child_builder = Some(Box::new(|b| f(b).render_once().into_any()));
+        self.child_builder = Some(Box::new(|b| f(b).into_element().into_any()));
         self
     }
 
@@ -286,14 +286,14 @@ impl<M: ManagedView> Element for MenuHandle<M> {
     }
 }
 
-impl<M: ManagedView> RenderOnce for MenuHandle<M> {
+impl<M: ManagedView> IntoElement for MenuHandle<M> {
     type Element = Self;
 
     fn element_id(&self) -> Option<gpui::ElementId> {
         Some(self.id.clone())
     }
 
-    fn render_once(self) -> Self::Element {
+    fn into_element(self) -> Self::Element {
         self
     }
 }

crates/ui2/src/components/divider.rs

@@ -1,4 +1,4 @@
-use gpui::{Div, RenderOnce};
+use gpui::{Div, IntoElement};
 
 use crate::prelude::*;
 
@@ -7,13 +7,13 @@ enum DividerDirection {
     Vertical,
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct Divider {
     direction: DividerDirection,
     inset: bool,
 }
 
-impl Component for Divider {
+impl RenderOnce for Divider {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/icon.rs

@@ -1,4 +1,4 @@
-use gpui::{rems, svg, RenderOnce, Svg};
+use gpui::{rems, svg, IntoElement, Svg};
 use strum::EnumIter;
 
 use crate::prelude::*;
@@ -133,14 +133,14 @@ impl Icon {
     }
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct IconElement {
     path: SharedString,
     color: Color,
     size: IconSize,
 }
 
-impl Component for IconElement {
+impl RenderOnce for IconElement {
     type Rendered = Svg;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/icon_button.rs

@@ -1,7 +1,7 @@
 use crate::{h_stack, prelude::*, Icon, IconElement};
 use gpui::{prelude::*, Action, AnyView, Div, MouseButton, MouseDownEvent, Stateful};
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct IconButton {
     id: ElementId,
     icon: Icon,
@@ -13,7 +13,7 @@ pub struct IconButton {
     on_mouse_down: Option<Box<dyn Fn(&MouseDownEvent, &mut WindowContext) + 'static>>,
 }
 
-impl Component for IconButton {
+impl RenderOnce for IconButton {
     type Rendered = Stateful<Div>;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/input.rs

@@ -1,5 +1,5 @@
 use crate::{prelude::*, Label};
-use gpui::{prelude::*, Div, RenderOnce, Stateful};
+use gpui::{prelude::*, Div, IntoElement, Stateful};
 
 #[derive(Default, PartialEq)]
 pub enum InputVariant {
@@ -8,7 +8,7 @@ pub enum InputVariant {
     Filled,
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct Input {
     placeholder: SharedString,
     value: String,
@@ -18,7 +18,7 @@ pub struct Input {
     is_active: bool,
 }
 
-impl Component for Input {
+impl RenderOnce for Input {
     type Rendered = Stateful<Div>;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/keybinding.rs

@@ -1,7 +1,7 @@
 use crate::prelude::*;
-use gpui::{Action, Div, RenderOnce};
+use gpui::{Action, Div, IntoElement};
 
-#[derive(RenderOnce, Clone)]
+#[derive(IntoElement, Clone)]
 pub struct KeyBinding {
     /// A keybinding consists of a key and a set of modifier keys.
     /// More then one keybinding produces a chord.
@@ -10,7 +10,7 @@ pub struct KeyBinding {
     key_binding: gpui::KeyBinding,
 }
 
-impl Component for KeyBinding {
+impl RenderOnce for KeyBinding {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {
@@ -44,12 +44,12 @@ impl KeyBinding {
     }
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct Key {
     key: SharedString,
 }
 
-impl Component for Key {
+impl RenderOnce for Key {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/label.rs

@@ -1,6 +1,6 @@
 use crate::prelude::*;
 use crate::styled_ext::StyledExt;
-use gpui::{relative, Div, Hsla, RenderOnce, StyledText, TextRun, WindowContext};
+use gpui::{relative, Div, Hsla, IntoElement, StyledText, TextRun, WindowContext};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
 pub enum LabelSize {
@@ -17,7 +17,7 @@ pub enum LineHeightStyle {
     UILabel,
 }
 
-#[derive(Clone, RenderOnce)]
+#[derive(IntoElement, Clone)]
 pub struct Label {
     label: SharedString,
     size: LabelSize,
@@ -26,7 +26,7 @@ pub struct Label {
     strikethrough: bool,
 }
 
-impl Component for Label {
+impl RenderOnce for Label {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {
@@ -85,7 +85,7 @@ impl Label {
     }
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct HighlightedLabel {
     label: SharedString,
     size: LabelSize,
@@ -94,7 +94,7 @@ pub struct HighlightedLabel {
     strikethrough: bool,
 }
 
-impl Component for HighlightedLabel {
+impl RenderOnce for HighlightedLabel {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/list.rs

@@ -1,5 +1,5 @@
 use gpui::{
-    div, px, AnyElement, ClickEvent, Div, RenderOnce, Stateful, StatefulInteractiveElement,
+    div, px, AnyElement, ClickEvent, Div, IntoElement, Stateful, StatefulInteractiveElement,
 };
 use smallvec::SmallVec;
 use std::rc::Rc;
@@ -25,7 +25,7 @@ pub enum ListHeaderMeta {
     Text(Label),
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct ListHeader {
     label: SharedString,
     left_icon: Option<Icon>,
@@ -34,7 +34,7 @@ pub struct ListHeader {
     toggle: Toggle,
 }
 
-impl Component for ListHeader {
+impl RenderOnce for ListHeader {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {
@@ -179,7 +179,7 @@ impl ListHeader {
     // }
 }
 
-#[derive(RenderOnce, Clone)]
+#[derive(IntoElement, Clone)]
 pub struct ListSubHeader {
     label: SharedString,
     left_icon: Option<Icon>,
@@ -201,7 +201,7 @@ impl ListSubHeader {
     }
 }
 
-impl Component for ListSubHeader {
+impl RenderOnce for ListSubHeader {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {
@@ -238,7 +238,7 @@ pub enum ListEntrySize {
     Medium,
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct ListItem {
     id: ElementId,
     disabled: bool,
@@ -328,7 +328,7 @@ impl ListItem {
     }
 }
 
-impl Component for ListItem {
+impl RenderOnce for ListItem {
     type Rendered = Stateful<Div>;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {
@@ -399,7 +399,7 @@ impl Component for ListItem {
     }
 }
 
-#[derive(RenderOnce, Clone)]
+#[derive(IntoElement, Clone)]
 pub struct ListSeparator;
 
 impl ListSeparator {
@@ -408,7 +408,7 @@ impl ListSeparator {
     }
 }
 
-impl Component for ListSeparator {
+impl RenderOnce for ListSeparator {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {
@@ -416,7 +416,7 @@ impl Component for ListSeparator {
     }
 }
 
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct List {
     /// Message to display when the list is empty
     /// Defaults to "No items"
@@ -426,7 +426,7 @@ pub struct List {
     children: SmallVec<[AnyElement; 2]>,
 }
 
-impl Component for List {
+impl RenderOnce for List {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {

crates/ui2/src/components/popover.rs

@@ -1,5 +1,5 @@
 use gpui::{
-    AnyElement, Component, Div, Element, ElementId, ParentElement, RenderOnce, Styled,
+    AnyElement, Div, Element, ElementId, IntoElement, ParentElement, RenderOnce, Styled,
     WindowContext,
 };
 use smallvec::SmallVec;
@@ -33,13 +33,13 @@ use crate::{v_stack, StyledExt};
 ///
 /// Example: A theme select control. Displays "One Dark", clicking it opens a list of themes.
 /// When one is selected, the theme select control displays the selected theme.
-#[derive(RenderOnce)]
+#[derive(IntoElement)]
 pub struct Popover {
     children: SmallVec<[AnyElement; 2]>,
     aside: Option<AnyElement>,
 }
 
-impl Component for Popover {
+impl RenderOnce for Popover {
     type Rendered = Div;
 
     fn render(self, cx: &mut WindowContext) -> Self::Rendered {
@@ -73,11 +73,11 @@ impl Popover {
         }
     }
 
-    pub fn aside(mut self, aside: impl RenderOnce) -> Self
+    pub fn aside(mut self, aside: impl IntoElement) -> Self
     where
         Self: Sized,
     {
-        self.aside = Some(aside.render_once().into_any());
+        self.aside = Some(aside.into_element().into_any());
         self
     }
 }

crates/ui2/src/components/tooltip.rs

@@ -1,4 +1,4 @@
-use gpui::{overlay, Action, AnyView, Overlay, Render, RenderOnce, VisualContext};
+use gpui::{overlay, Action, AnyView, IntoElement, Overlay, Render, VisualContext};
 use settings2::Settings;
 use theme2::{ActiveTheme, ThemeSettings};
 

crates/ui2/src/prelude.rs

@@ -1,5 +1,5 @@
 pub use gpui::{
-    div, Component, Element, ElementId, InteractiveElement, ParentElement, SharedString, Styled,
+    div, Element, ElementId, InteractiveElement, ParentElement, RenderOnce, SharedString, Styled,
     ViewContext, WindowContext,
 };
 

crates/workspace2/src/dock.rs

@@ -1,7 +1,7 @@
 use crate::{status_bar::StatusItemView, Axis, Workspace};
 use gpui::{
     div, px, Action, AnchorCorner, AnyView, AppContext, Div, Entity, EntityId, EventEmitter,
-    FocusHandle, FocusableView, ParentElement, Render, RenderOnce, SharedString, Styled,
+    FocusHandle, FocusableView, IntoElement, ParentElement, Render, SharedString, Styled,
     Subscription, View, ViewContext, VisualContext, WeakView, WindowContext,
 };
 use schemars::JsonSchema;

crates/workspace2/src/pane.rs

@@ -1344,7 +1344,7 @@ impl Pane {
         item: &Box<dyn ItemHandle>,
         detail: usize,
         cx: &mut ViewContext<'_, Pane>,
-    ) -> impl RenderOnce {
+    ) -> impl IntoElement {
         let label = item.tab_content(Some(detail), cx);
         let close_icon = || {
             let id = item.item_id();
@@ -1439,7 +1439,7 @@ impl Pane {
             )
     }
 
-    fn render_tab_bar(&mut self, cx: &mut ViewContext<'_, Pane>) -> impl RenderOnce {
+    fn render_tab_bar(&mut self, cx: &mut ViewContext<'_, Pane>) -> impl IntoElement {
         div()
             .group("tab_bar")
             .id("tab_bar")

crates/workspace2/src/pane_group.rs

@@ -7,7 +7,7 @@ use db2::sqlez::{
     statement::Statement,
 };
 use gpui::{
-    point, size, AnyWeakView, Bounds, Div, Model, Pixels, Point, RenderOnce, View, ViewContext,
+    point, size, AnyWeakView, Bounds, Div, IntoElement, Model, Pixels, Point, View, ViewContext,
 };
 use parking_lot::Mutex;
 use project2::Project;
@@ -132,7 +132,7 @@ impl PaneGroup {
         zoomed: Option<&AnyWeakView>,
         app_state: &Arc<AppState>,
         cx: &mut ViewContext<Workspace>,
-    ) -> impl RenderOnce {
+    ) -> impl IntoElement {
         self.root.render(
             project,
             0,
@@ -204,7 +204,7 @@ impl Member {
         zoomed: Option<&AnyWeakView>,
         app_state: &Arc<AppState>,
         cx: &mut ViewContext<Workspace>,
-    ) -> impl RenderOnce {
+    ) -> impl IntoElement {
         match self {
             Member::Pane(pane) => {
                 // todo!()
@@ -584,8 +584,8 @@ impl PaneAxis {
                             app_state,
                             cx,
                         )
-                        .render_into_any(),
+                        .into_any_element(),
-                    Member::Pane(pane) => pane.clone().render_into_any(),
+                    Member::Pane(pane) => pane.clone().into_any_element(),
                 }
             }))
 

crates/workspace2/src/status_bar.rs

@@ -2,7 +2,7 @@ use std::any::TypeId;
 
 use crate::{ItemHandle, Pane};
 use gpui::{
-    div, AnyView, Div, ParentElement, Render, RenderOnce, Styled, Subscription, View, ViewContext,
+    div, AnyView, Div, IntoElement, ParentElement, Render, Styled, Subscription, View, ViewContext,
     WindowContext,
 };
 use theme2::ActiveTheme;
@@ -53,14 +53,14 @@ impl Render for StatusBar {
 }
 
 impl StatusBar {
-    fn render_left_tools(&self, cx: &mut ViewContext<Self>) -> impl RenderOnce {
+    fn render_left_tools(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
         h_stack()
             .items_center()
             .gap_2()
             .children(self.left_items.iter().map(|item| item.to_any()))
     }
 
-    fn render_right_tools(&self, cx: &mut ViewContext<Self>) -> impl RenderOnce {
+    fn render_right_tools(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
         h_stack()
             .items_center()
             .gap_2()