Rename back to div

crates/ui2/src/components/avatar.rs

@@ -44,12 +44,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct AvatarStory;
 
     impl Render for AvatarStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/components/button.rs

@@ -236,13 +236,13 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{h_stack, v_stack, LabelColor, Story};
-    use gpui::{rems, Node, Render};
+    use gpui::{rems, Div, Render};
     use strum::IntoEnumIterator;
 
     pub struct ButtonStory;
 
     impl Render for ButtonStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             let states = InteractionState::iter();

crates/ui2/src/components/checkbox.rs

@@ -171,12 +171,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{h_stack, Story};
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct CheckboxStory;
 
     impl Render for CheckboxStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/components/context_menu.rs

@@ -65,12 +65,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::story::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct ContextMenuStory;
 
     impl Render for ContextMenuStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/components/details.rs

@@ -47,12 +47,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Button, Story};
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct DetailsStory;
 
     impl Render for DetailsStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/components/elevated_surface.rs

@@ -1,11 +1,11 @@
-use gpui::Node;
+use gpui::Div;
 
 use crate::{prelude::*, v_stack};
 
 /// Create an elevated surface.
 ///
 /// Must be used inside of a relative parent element
-pub fn elevated_surface<V: 'static>(level: ElevationIndex, cx: &mut ViewContext<V>) -> Node<V> {
+pub fn elevated_surface<V: 'static>(level: ElevationIndex, cx: &mut ViewContext<V>) -> Div<V> {
     let colors = cx.theme().colors();
 
     // let shadow = BoxShadow {
@@ -23,6 +23,6 @@ pub fn elevated_surface<V: 'static>(level: ElevationIndex, cx: &mut ViewContext<
         .shadow(level.shadow())
 }
 
-pub fn modal<V: 'static>(cx: &mut ViewContext<V>) -> Node<V> {
+pub fn modal<V: 'static>(cx: &mut ViewContext<V>) -> Div<V> {
     elevated_surface(ElevationIndex::ModalSurface, cx)
 }

crates/ui2/src/components/facepile.rs

@@ -33,12 +33,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{static_players, Story};
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct FacepileStory;
 
     impl Render for FacepileStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             let players = static_players();

crates/ui2/src/components/icon.rs

@@ -204,7 +204,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
     use strum::IntoEnumIterator;
 
     use crate::Story;
@@ -214,7 +214,7 @@ mod stories {
     pub struct IconStory;
 
     impl Render for IconStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             let icons = Icon::iter();

crates/ui2/src/components/input.rs

@@ -110,12 +110,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct InputStory;
 
     impl Render for InputStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/components/keybinding.rs

@@ -158,13 +158,13 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
     use itertools::Itertools;
 
     pub struct KeybindingStory;
 
     impl Render for KeybindingStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             let all_modifier_permutations = ModifierKey::iter().permutations(2);

crates/ui2/src/components/label.rs

@@ -196,12 +196,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct LabelStory;
 
     impl Render for LabelStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/components/palette.rs

@@ -159,7 +159,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     use crate::{ModifierKeys, Story};
 
@@ -168,7 +168,7 @@ mod stories {
     pub struct PaletteStory;
 
     impl Render for PaletteStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             {

crates/ui2/src/components/panel.rs

@@ -126,12 +126,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Label, Story};
-    use gpui::{InteractiveComponent, Node, Render};
+    use gpui::{InteractiveComponent, Div, Render};
 
     pub struct PanelStory;
 
     impl Render for PanelStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/components/stack.rs

@@ -1,17 +1,17 @@
-use gpui::{div, Node};
+use gpui::{div, Div};
 
 use crate::StyledExt;
 
 /// Horizontally stacks elements.
 ///
 /// Sets `flex()`, `flex_row()`, `items_center()`
-pub fn h_stack<V: 'static>() -> Node<V> {
+pub fn h_stack<V: 'static>() -> Div<V> {
     div().h_flex()
 }
 
 /// Vertically stacks elements.
 ///
 /// Sets `flex()`, `flex_col()`
-pub fn v_stack<V: 'static>() -> Node<V> {
+pub fn v_stack<V: 'static>() -> Div<V> {
     div().v_flex()
 }

crates/ui2/src/components/tab.rs

@@ -1,6 +1,6 @@
 use crate::prelude::*;
 use crate::{Icon, IconColor, IconElement, Label, LabelColor};
-use gpui::{prelude::*, red, ElementId, Node, Render, View};
+use gpui::{prelude::*, red, Div, ElementId, Render, View};
 
 #[derive(Component, Clone)]
 pub struct Tab {
@@ -21,7 +21,7 @@ struct TabDragState {
 }
 
 impl Render for TabDragState {
-    type Element = Node<Self>;
+    type Element = Div<Self>;
 
     fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
         div().w_8().h_4().bg(red())
@@ -178,7 +178,7 @@ mod stories {
     pub struct TabStory;
 
     impl Render for TabStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             let git_statuses = GitStatus::iter();

crates/ui2/src/components/toast.rs

@@ -69,7 +69,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     use crate::{Label, Story};
 
@@ -78,7 +78,7 @@ mod stories {
     pub struct ToastStory;
 
     impl Render for ToastStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/components/tooltip.rs

@@ -1,4 +1,4 @@
-use gpui::{div, Node, ParentComponent, Render, SharedString, Styled, ViewContext};
+use gpui::{div, Div, ParentComponent, Render, SharedString, Styled, ViewContext};
 use theme2::ActiveTheme;
 
 #[derive(Clone, Debug)]
@@ -13,7 +13,7 @@ impl TextTooltip {
 }
 
 impl Render for TextTooltip {
-    type Element = Node<Self>;
+    type Element = Div<Self>;
 
     fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
         let theme = cx.theme();

crates/ui2/src/story.rs

@@ -1,11 +1,11 @@
-use gpui::Node;
+use gpui::Div;
 
 use crate::prelude::*;
 
 pub struct Story {}
 
 impl Story {
-    pub fn container<V: 'static>(cx: &mut ViewContext<V>) -> Node<V> {
+    pub fn container<V: 'static>(cx: &mut ViewContext<V>) -> Div<V> {
         div()
             .size_full()
             .flex()

crates/ui2/src/to_extract/assistant_panel.rs

@@ -77,11 +77,11 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
     pub struct AssistantPanelStory;
 
     impl Render for AssistantPanelStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/breadcrumb.rs

@@ -1,5 +1,5 @@
 use crate::{h_stack, prelude::*, HighlightedText};
-use gpui::{prelude::*, Node};
+use gpui::{prelude::*, Div};
 use std::path::PathBuf;
 
 #[derive(Clone)]
@@ -16,7 +16,7 @@ impl Breadcrumb {
         Self { path, symbols }
     }
 
-    fn render_separator<V: 'static>(&self, cx: &WindowContext) -> Node<V> {
+    fn render_separator<V: 'static>(&self, cx: &WindowContext) -> Div<V> {
         div()
             .child(" › ")
             .text_color(cx.theme().colors().text_muted)
@@ -77,7 +77,7 @@ mod stories {
     pub struct BreadcrumbStory;
 
     impl Render for BreadcrumbStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/buffer.rs

@@ -235,12 +235,12 @@ mod stories {
         empty_buffer_example, hello_world_rust_buffer_example,
         hello_world_rust_buffer_with_status_example, Story,
     };
-    use gpui::{rems, Node, Render};
+    use gpui::{rems, Div, Render};
 
     pub struct BufferStory;
 
     impl Render for BufferStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/buffer_search.rs

@@ -1,4 +1,4 @@
-use gpui::{Node, Render, View, VisualContext};
+use gpui::{Div, Render, View, VisualContext};
 
 use crate::prelude::*;
 use crate::{h_stack, Icon, IconButton, IconColor, Input};
@@ -27,9 +27,9 @@ impl BufferSearch {
 }
 
 impl Render for BufferSearch {
-    type Element = Node<Self>;
+    type Element = Div<Self>;
 
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> Node<Self> {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> Div<Self> {
         h_stack()
             .bg(cx.theme().colors().toolbar_background)
             .p_2()

crates/ui2/src/to_extract/chat_panel.rs

@@ -107,7 +107,7 @@ pub use stories::*;
 #[cfg(feature = "stories")]
 mod stories {
     use chrono::DateTime;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     use crate::{Panel, Story};
 
@@ -116,7 +116,7 @@ mod stories {
     pub struct ChatPanelStory;
 
     impl Render for ChatPanelStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/collab_panel.rs

@@ -93,12 +93,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct CollabPanelStory;
 
     impl Render for CollabPanelStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/command_palette.rs

@@ -27,7 +27,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     use crate::Story;
 
@@ -36,7 +36,7 @@ mod stories {
     pub struct CommandPaletteStory;
 
     impl Render for CommandPaletteStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/copilot.rs

@@ -25,7 +25,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     use crate::Story;
 
@@ -34,7 +34,7 @@ mod stories {
     pub struct CopilotModalStory;
 
     impl Render for CopilotModalStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/editor_pane.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use gpui::{Node, Render, View, VisualContext};
+use gpui::{Div, Render, View, VisualContext};
 
 use crate::prelude::*;
 use crate::{
@@ -48,9 +48,9 @@ impl EditorPane {
 }
 
 impl Render for EditorPane {
-    type Element = Node<Self>;
+    type Element = Div<Self>;
 
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> Node<Self> {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> Div<Self> {
         v_stack()
             .w_full()
             .h_full()

crates/ui2/src/to_extract/language_selector.rs

@@ -40,12 +40,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct LanguageSelectorStory;
 
     impl Render for LanguageSelectorStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/multi_buffer.rs

@@ -40,12 +40,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{hello_world_rust_buffer_example, Story};
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct MultiBufferStory;
 
     impl Render for MultiBufferStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/notifications_panel.rs

@@ -352,12 +352,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Panel, Story};
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct NotificationsPanelStory;
 
     impl Render for NotificationsPanelStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/project_panel.rs

@@ -55,12 +55,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Panel, Story};
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct ProjectPanelStory;
 
     impl Render for ProjectPanelStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/recent_projects.rs

@@ -36,12 +36,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct RecentProjectsStory;
 
     impl Render for RecentProjectsStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/tab_bar.rs

@@ -100,12 +100,12 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     pub struct TabBarStory;
 
     impl Render for TabBarStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/terminal.rs

@@ -83,11 +83,11 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
     pub struct TerminalStory;
 
     impl Render for TerminalStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/theme_selector.rs

@@ -39,7 +39,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     use crate::Story;
 
@@ -48,7 +48,7 @@ mod stories {
     pub struct ThemeSelectorStory;
 
     impl Render for ThemeSelectorStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/title_bar.rs

@@ -1,7 +1,7 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
-use gpui::{Node, Render, View, VisualContext};
+use gpui::{Div, Render, View, VisualContext};
 
 use crate::prelude::*;
 use crate::settings::user_settings;
@@ -86,9 +86,9 @@ impl TitleBar {
 }
 
 impl Render for TitleBar {
-    type Element = Node<Self>;
+    type Element = Div<Self>;
 
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> Node<Self> {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> Div<Self> {
         let settings = user_settings(cx);
 
         // let has_focus = cx.window_is_active();
@@ -202,9 +202,9 @@ mod stories {
     }
 
     impl Render for TitleBarStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
-        fn render(&mut self, cx: &mut ViewContext<Self>) -> Node<Self> {
+        fn render(&mut self, cx: &mut ViewContext<Self>) -> Div<Self> {
             Story::container(cx)
                 .child(Story::title_for::<_, TitleBar>(cx))
                 .child(Story::label(cx, "Default"))

crates/ui2/src/to_extract/toolbar.rs

@@ -73,7 +73,7 @@ mod stories {
     use std::path::PathBuf;
     use std::str::FromStr;
 
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     use crate::{Breadcrumb, HighlightedText, Icon, IconButton, Story, Symbol};
 
@@ -82,7 +82,7 @@ mod stories {
     pub struct ToolbarStory;
 
     impl Render for ToolbarStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/traffic_lights.rs

@@ -77,7 +77,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui::{Node, Render};
+    use gpui::{Div, Render};
 
     use crate::Story;
 
@@ -86,7 +86,7 @@ mod stories {
     pub struct TrafficLightsStory;
 
     impl Render for TrafficLightsStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             Story::container(cx)

crates/ui2/src/to_extract/workspace.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use chrono::DateTime;
-use gpui::{px, relative, Node, Render, Size, View, VisualContext};
+use gpui::{px, relative, Div, Render, Size, View, VisualContext};
 use settings2::Settings;
 use theme2::ThemeSettings;
 
@@ -192,9 +192,9 @@ impl Workspace {
 }
 
 impl Render for Workspace {
-    type Element = Node<Self>;
+    type Element = Div<Self>;
 
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> Node<Self> {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> Div<Self> {
         let root_group = PaneGroup::new_panes(
             vec![Pane::new(
                 "pane-0",
@@ -388,7 +388,7 @@ mod stories {
     }
 
     impl Render for WorkspaceStory {
-        type Element = Node<Self>;
+        type Element = Div<Self>;
 
         fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
             div().child(self.workspace.clone())